cahrens 8ca6e324af Merge branch 'master' into feature/btalbot/studio-checklists ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/sass/base-style.scss
	cms/urls.py

2013-03-21 12:23:13 -04:00

..

client_templates

Urls working.

2013-03-20 16:37:08 -04:00

coffee

Also clean up children after sort saved.

2013-03-20 17:59:24 -04:00

css

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

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

img

studio - advanced modules: added in advanced module button icon per artie/vik work

2013-03-05 10:39:21 -05:00

js

Use Brian's open external method.

2013-03-21 11:17:31 -04:00

sass

Merge branch 'master' into feature/btalbot/studio-checklists

2013-03-21 12:23:13 -04:00