Merge remote-tracking branch 'origin/aamir-khan/ECOM-528-donation-verified-courses' into aamir-khan/ECOM-528-donation-verified-courses

Browse Source

Conflicts:
	common/djangoapps/student/tests/test_recent_enrollments.py

...

This commit is contained in:

arbisoft

2015-01-09 17:56:32 +05:00

parent 36626a2b8b 507d7b1a1f

commit d244b13445

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