Brian Wilson d6a74a644d Merge branch 'master' into release ...

Conflicts:
	cms/static/js/views/modals/edit_xblock.js

2014-05-13 11:10:48 -04:00

..

djangoapps

Merge pull request #2768 from carsongee/cg/ssl-next-url

2014-05-11 20:12:12 -04:00

lib

Merge branch 'master' into release

2014-05-13 11:10:48 -04:00

static

Merge pull request #3466 from lduarte1991/lduarte-harvardx

2014-05-09 16:14:42 -04:00

templates

Implement editing from the Studio container page.

2014-04-09 10:32:11 -04:00

test

Merge pull request #3464 from mitocw/cg/course_image_fixes

2014-05-13 09:19:07 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

…