David Ormsbee 43d8c7a712 Merge branch 'release' ...

Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py

2014-11-13 10:11:12 -05:00

..

djangoapps

Merge branch 'release'

2014-11-13 10:11:12 -05:00

envs

Merge branch 'release'

2014-11-13 10:11:12 -05:00

lib

Remove more pep8 violations

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

static

Merge pull request #5915 from edx/alasdair/rwd-trackselection

2014-11-10 16:41:50 -05:00

templates

Merge branch 'release'

2014-11-13 10:11:12 -05:00

__init__.py

…

.coveragerc

…

startup.py

Remove more pep8 violations

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

tests.py

Remove more pep8 violations

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

urls.py

Add endpoint to log in with OAuth access token

2014-11-05 14:09:41 -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