Will Daly 5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py

2014-11-10 15:05:37 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-11-10 15:05:37 -05:00

lib

Merge pull request #5816 from edx/usman/plat71-mongo-autoreconnect-errors-2

2014-11-10 19:56:11 +05:00

static

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-11-10 15:05:37 -05:00

templates

Redirect users to the track selection page or ?next page when using third party auth

2014-10-28 10:28:30 -04:00

test

Display validation messages for any xblock on the container page.

2014-11-06 15:48:55 -05:00

.gitignore

…

xml_cleanup.py

…