Greg Price 0d37b4b254 Merge branch 'release' ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py

2014-06-02 15:29:40 -04:00

..

djangoapps

Merge branch 'release'

2014-06-02 15:29:40 -04:00

lib

Merge branch 'release'

2014-06-02 15:29:40 -04:00

static

Diacritic Plugin for Annotator Tool: Pull-request Fixes

2014-06-02 10:45:29 -04:00

templates

Implement editing from the Studio container page.

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

test

Check YouTube for Bok-Choy

2014-06-02 16:37:24 +00:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…