Don Mitchell 4f32d5f34d Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor ...

Conflicts:
	cms/static/sass/_assets.scss
	cms/static/sass/_base.scss
	cms/static/sass/_unit.scss
	cms/templates/unit.html

2013-01-02 17:39:27 -05:00

..

spec

Clean old javascript tests from CAS

2012-10-31 13:21:36 -04:00

src

Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor

2013-01-02 17:39:27 -05:00

.gitignore

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -04:00

files.json

Fix broken jasmine tests for CMS. All (11) specs are now passing.

2012-12-19 11:26:36 -05:00