Merge pull request #12532 from edx/jibsheet/fixing-release-to-master-merge-with-conflicts

Browse Source

Jibsheet/fixing release to master merge with conflicts

...

This commit is contained in:

John Eskew

2016-05-20 13:13:50 -04:00

parent 846e05cdec 01fca6b67d

commit 76685e4e69

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