cahrens c95b44d851 Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py

2013-05-23 11:41:12 -04:00

..

client_templates

Merge branch 'master' into feature/christina/metadata-ui

2013-05-23 11:41:12 -04:00

coffee

Merge branch 'master' into feature/christina/metadata-ui

2013-05-23 11:41:12 -04:00

css

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

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

fonts/vendor

studio - adds in Font Awesome typeface, styling, and Sass import reference

2013-05-22 15:55:46 -04:00

img

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

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

js

Merge branch 'master' into feature/christina/metadata-ui

2013-05-23 11:41:12 -04:00

sass

Merge branch 'master' into feature/christina/metadata-ui

2013-05-23 11:41:12 -04:00