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

Conflicts:
	lms/djangoapps/student_account/test/test_views.py
	lms/djangoapps/student_account/urls.py
	lms/djangoapps/student_account/views.py

2014-10-20 10:57:05 -04:00

..

djangoapps

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

2014-10-20 10:57:05 -04:00

envs

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

2014-10-20 10:57:05 -04:00

lib

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

2014-10-20 10:57:05 -04:00

static

Merge pull request #5615 from edx/renzo/account-password-reset

2014-10-20 10:21:18 -04:00

templates

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

2014-10-20 10:57:05 -04: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

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

2014-10-20 10:57:05 -04: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