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

..

edx

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

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

edx-sandbox

Update lxml to 3.4.4

2015-07-13 16:14:39 -04:00

monitoring

Add requirements files that can be used with package monitorig tool.

2015-09-18 10:39:07 -04:00

system/ubuntu

SAML2 third_party_auth provider(s) - PR 8018

2015-06-26 13:23:59 -07:00