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

Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt

2016-01-26 11:25:41 -05:00

..

edx

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

2016-01-26 11:25:41 -05:00

edx-sandbox

Instead of listing devops, use our group

2015-11-25 13:47:56 -05: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