common/djangoapps/student · 259edef9224b964cbbcfd4db438482d2eede64c0 · edx / edx-platform

Merge commit '' into edx-west/rc · 280c3ebd

Conflicts:
	cms/djangoapps/contentstore/views/component.py
	lms/djangoapps/courseware/tabs.py
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/course_navigation.html
	lms/templates/courseware/courseware.html
	lms/templates/navigation.html
	lms/templates/problem.html
	requirements/edx/github.txt

committed Mar 30, 2014

280c3ebd

Name	Last commit	Last update
..
management		Loading commit data...
migrations		Loading commit data...
tests		Loading commit data...
__init__.py		Loading commit data...
admin.py		Loading commit data...
auth.py		Loading commit data...
firebase_token_generator.py		Loading commit data...
forms.py		Loading commit data...
middleware.py		Loading commit data...
models.py		Loading commit data...
roles.py		Loading commit data...
views.py		Loading commit data...