lms/djangoapps/courseware/features · b7cadf434ece9f8aecc5089356d1a5b57db4dbac · edx / edx-platform

Merge branch 'release' into edx-west/release-candidate-try · b6ea50d5

Conflicts:
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/external_auth/views.py
	common/djangoapps/student/views.py
	lms/envs/common.py
	lms/envs/test.py

committed Jun 28, 2013

b6ea50d5

Name	Last commit	Last update
..
common.py		Loading commit data...
courseware.py		Loading commit data...
courseware_common.py		Loading commit data...
high-level-tabs.feature		Loading commit data...
high-level-tabs.py		Loading commit data...
homepage.feature		Loading commit data...
homepage.py		Loading commit data...
login.feature		Loading commit data...
login.py		Loading commit data...
navigation.feature		Loading commit data...
navigation.py		Loading commit data...
openended.feature		Loading commit data...
openended.py		Loading commit data...
problems.feature		Loading commit data...
problems.py		Loading commit data...
problems_setup.py		Loading commit data...
registration.feature		Loading commit data...
registration.py		Loading commit data...
signup.feature		Loading commit data...
signup.py		Loading commit data...
video.feature		Loading commit data...
video.py		Loading commit data...
xqueue_setup.py		Loading commit data...