cahrens f91060d197 Merge branch 'master' into feature/cas/manual-policy ...

Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py

2013-02-19 13:27:35 -05:00

..

client_templates

Merge branch 'master' into feature/cas/manual-policy

2013-02-19 13:27:35 -05:00

coffee

Add vendor files to files.json for the cms jasmine tests to work.

2013-01-31 13:48:38 -05:00

css

studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon

2013-01-22 23:32:51 -05:00

img

resolving merge conflict and missing Sass mixin

2013-02-15 14:10:52 -05:00

js

Merge branch 'master' into feature/cas/manual-policy

2013-02-19 13:27:35 -05:00

sass

Merge branch 'master' into feature/cas/manual-policy

2013-02-19 13:27:35 -05:00