Will Daly 48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py

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

..

comment_client

Merge pull request #5510 from edx/christina/bug-tnl-543

2014-10-16 16:03:22 -04:00

newrelic_logging

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

xblock

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

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

__init__.py

Remove lms/lib from sys.path in favore of using it as the module lms.lib

2013-11-08 11:08:48 -05:00