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

Conflicts:
	requirements/edx/github.txt

2015-01-30 09:44:42 -05:00

..

edx

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

2015-01-30 09:44:42 -05:00

edx-sandbox

Update contact info for licensing questions

2014-11-26 15:16:04 -05:00

system/ubuntu

Moved brew-formulas.txt to Brewfile

2014-01-27 10:51:31 -05:00