urls.py
4.13 KB
-
Merge remote-tracking branch 'origin/feature/cdodge/static-tab-edit' · 433b3c64
into courseinfo Conflicts: cms/templates/widgets/header.html cms/urls.py
Don Mitchell committed
into courseinfo Conflicts: cms/templates/widgets/header.html cms/urls.py