cahrens f616aecd81 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor ...

Conflicts:
	common/lib/xmodule/xmodule/js/src/problem/edit.coffee

2013-01-08 14:56:59 -05:00

..

client_templates

styling - settings layout and delete buttons

2012-12-13 13:35:58 -05:00

coffee

Empty template now recognized as allowing markdown editing

2013-01-08 10:53:45 -05:00

css

More deletion

2013-01-03 11:21:01 -05:00

img

More deletion

2013-01-03 11:21:01 -05:00

js

Save work

2013-01-08 13:39:16 -05:00

sass

resolving Sass issues caused by previous merge conflict resolution in branch

2013-01-03 11:44:09 -05:00