common/lib/xmodule/xmodule · eea59005918848603ededf7bc89e6b4fb4da77db · edx / edx-platform

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 21135416

Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py

committed Mar 12, 2013

21135416

Name	Last commit	Last update
..
contentstore		Loading commit data...
css		Loading commit data...
js		Loading commit data...
modulestore		Loading commit data...
open_ended_grading_classes		Loading commit data...
templates		Loading commit data...
tests		Loading commit data...
util		Loading commit data...
__init__.py		Loading commit data...
abtest_module.py		Loading commit data...
annotatable_module.py		Loading commit data...
backcompat_module.py		Loading commit data...
capa_module.py		Loading commit data...
combined_open_ended_module.py		Loading commit data...
conditional_module.py		Loading commit data...
course_module.py		Loading commit data...
discussion_module.py		Loading commit data...
editing_module.py		Loading commit data...
error_module.py		Loading commit data...
errortracker.py		Loading commit data...
exceptions.py		Loading commit data...
fields.py		Loading commit data...
foldit_module.py		Loading commit data...
graders.py		Loading commit data...
gst_module.py		Loading commit data...
hidden_module.py		Loading commit data...
html_checker.py		Loading commit data...
html_module.py		Loading commit data...
mako_module.py		Loading commit data...
peer_grading_module.py		Loading commit data...
plugin.py		Loading commit data...
poll_module.py		Loading commit data...
progress.py		Loading commit data...
randomize_module.py		Loading commit data...
raw_module.py		Loading commit data...
schematic_module.py		Loading commit data...
seq_module.py		Loading commit data...
static_content.py		Loading commit data...
stringify.py		Loading commit data...
template_module.py		Loading commit data...
templates.py		Loading commit data...
timeinfo.py		Loading commit data...
timelimit_module.py		Loading commit data...
timeparse.py		Loading commit data...
vertical_module.py		Loading commit data...
video_module.py		Loading commit data...
videoalpha_module.py		Loading commit data...
wrapper_module.py		Loading commit data...
x_module.py		Loading commit data...
xml_module.py		Loading commit data...