common/test/data/full · 7229a9cdaf459d6d99a63ebed843e8680fd7c7e7 · edx / edx-platform

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · c917725f

Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt

committed Dec 07, 2012

c917725f

Name	Last commit	Last update
..
about		Loading commit data...
chapter		Loading commit data...
course		Loading commit data...
custom_tags		Loading commit data...
html		Loading commit data...
info		Loading commit data...
policies		Loading commit data...
problem		Loading commit data...
sequential		Loading commit data...
static		Loading commit data...
subs		Loading commit data...
tabs		Loading commit data...
vertical		Loading commit data...
video		Loading commit data...
README.md		Loading commit data...
course.xml		Loading commit data...
course_settings.json		Loading commit data...
grading_policy.js		Loading commit data...
to_delete		Loading commit data...

README.md