Chris Dodge ebf6d74776 Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs ...

Conflicts:
	cms/static/js/base.js

2012-10-13 21:44:15 -04:00

..

auth

allow importing of .tar.gz packages of courseware

2012-10-12 10:33:31 -04:00

contentstore

Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs

2012-10-13 21:44:15 -04:00

github_sync

Make saving also save the children in the #sortable element (TODO: name the #sortable element better)

2012-09-18 13:19:30 -04:00