Merge remote-tracking branch 'origin/feature/cdodge/static-tab-edit'
into courseinfo Conflicts: cms/templates/widgets/header.html cms/urls.py
Showing
cms/static/coffee/src/views/tabs.coffee
0 → 100644
cms/static/sass/_mixins.scss
deleted
120000 → 0
cms/static/sass/_mixins.scss
0 → 100644
cms/static/sass/bourbon
deleted
120000 → 0
cms/static/sass/bourbon
0 → 100644
cms/templates/edit-tabs.html
0 → 100644
common/test/data/graded/course.xml
deleted
120000 → 0
common/test/data/graded/course.xml
0 → 100644
common/test/data/test_start_date/course.xml
0 → 100644
common/test/data/toy/course.xml
deleted
120000 → 0
common/test/data/toy/course.xml
0 → 100644
lms/static/images/edge-on-edx-logo.png
0 → 100644
lms/static/sass/base/_mixins.scss
deleted
120000 → 0
lms/static/sass/base/_mixins.scss
0 → 100644
lms/static/sass/bourbon
deleted
120000 → 0
lms/static/sass/bourbon
0 → 100644
Please
register
or
sign in
to comment