Merge pull request #8960 from edx/release-2015-07-08-conflict

Browse Source

Release 2015-07-08 conflict

...

This commit is contained in:

Max Rothman

2015-07-17 14:42:47 -04:00

parent 626d3fb02d d7b57309da

commit 2d216fc610

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