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

Browse Source

Conflicts:
	requirements/edx/github.txt

...

This commit is contained in:

Adam Palay

2015-03-03 11:00:16 -05:00

parent 95387be93b e9fed1736e

commit b35e43377a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available