Diana Huang a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/course_modes/views.py

2014-11-04 10:50:09 -05:00

..

djangoapps

Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form

2014-11-04 10:50:09 -05:00

envs

Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form

2014-11-04 10:50:09 -05:00

lib

Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form

2014-10-28 15:16:27 -04:00

static

Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form

2014-11-04 10:50:09 -05:00

templates

Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form

2014-11-04 10:50:09 -05:00

__init__.py

…

.coveragerc

…

startup.py

Moved imports to manage.py and wsgi.py.

2014-10-14 18:27:31 +05:00

tests.py

add simple help-modal-test

2014-09-22 09:34:32 -04:00

urls.py

Initial setup for new enrollment API

2014-10-20 20:26:31 +00:00

wsgi_apache_lms.py

Moved imports to manage.py and wsgi.py.

2014-10-14 18:27:31 +05:00

wsgi.py

Moved imports to manage.py and wsgi.py.

2014-10-14 18:27:31 +05:00