Adam Palay 9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html

2015-10-19 08:35:33 -05:00

..

__init__.py

moved django_comment_client into edx

2012-07-23 16:20:45 -04:00

tests.py

Fix quality for template escaping

2015-10-16 15:47:11 +00:00

urls.py

Remove "nopep" pragma

2015-02-27 11:49:51 -08:00

views.py

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-10-19 08:35:33 -05:00