christopher lee 212598e649 Merge branch 'release' ...

Conflicts:
	lms/djangoapps/mobile_api/course_info/tests.py

2014-12-04 16:39:37 -05:00

..

djangoapps

Merge branch 'release'

2014-12-04 16:39:37 -05:00

envs

Merge pull request #6070 from edx/will/verified-messaging-per-course

2014-12-02 16:08:25 -05:00

lib

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

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

static

Merge pull request #5774 from edx/cdodge/shopping-cart-touchups

2014-12-04 14:02:19 -05:00

templates

Merge pull request #5774 from edx/cdodge/shopping-cart-touchups

2014-12-04 14:02:19 -05:00

__init__.py

…

.coveragerc

…

startup.py

s/pylint: disable=W0104/pylint: disable=pointless-statement/

2014-12-01 11:22:12 -05:00

tests.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

urls.py

Add support for external auth on the combined login/registration page

2014-12-04 09:34:51 -05:00

wsgi_apache_lms.py

Moved imports to manage.py and wsgi.py.

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

wsgi.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00