Files · 0d37b4b254885c1922afc74b29f548cc18daf86b · edx / edx-platform

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

committed 10 years ago

0d37b4b2

Name	Last commit	Last update
.tx		Loading commit data...
cms		Loading commit data...
common		Loading commit data...
conf/locale		Loading commit data...
docs		Loading commit data...
i18n		Loading commit data...
jenkins		Loading commit data...
lms		Loading commit data...
pavelib		Loading commit data...
proxy		Loading commit data...
rakelib		Loading commit data...
requirements		Loading commit data...
scripts		Loading commit data...
test_root		Loading commit data...
vendor_extra/tinymce		Loading commit data...
.gitattributes		Loading commit data...
.gitignore		Loading commit data...
.jshintrc		Loading commit data...
.pep8		Loading commit data...
.reviewboardrc		Loading commit data...
.ruby-gemset		Loading commit data...
.ruby-version		Loading commit data...
AUTHORS		Loading commit data...
Brewfile		Loading commit data...
CHANGELOG.rst		Loading commit data...
CONTRIBUTING.rst		Loading commit data...
Gemfile		Loading commit data...
Gemfile.lock		Loading commit data...
LICENSE		Loading commit data...
README.md		Loading commit data...
manage.py		Loading commit data...
mongo_indexes.md		Loading commit data...
package.json		Loading commit data...
pavement.py		Loading commit data...
pylintrc		Loading commit data...
rakefile		Loading commit data...
setup.cfg		Loading commit data...
setup.py		Loading commit data...

README.md