Calen Pennington 6d246f0685 Merge remote-tracking branch 'origin/master' into ps-cms-backbone ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/coffee/unit.coffee
	cms/templates/index.html
	cms/templates/widgets/sequence-edit.html

2012-07-10 08:55:45 -04:00

..

spec

Pass in element in CMS.start() instead

2012-07-06 11:33:37 -04:00

src

Remove unnecessary fat arrow

2012-07-06 11:52:10 -04:00

.gitignore

Html Module can now be editing, saved, and re-opened

2012-06-22 10:58:18 -04:00

files.json

Move vendored js files into js/vendor/

2012-07-06 12:07:21 -04:00

unit.coffee

Remove old JavaScript files

2012-07-05 09:38:51 -04:00