Merge pull request #9388 from edx/release-2015-08-18-conflict

Browse Source

Release 2015 08 18 conflict

...

This commit is contained in:

Renzo Lucioni

2015-08-19 18:08:25 -04:00

parent 2f5193cf18 a9fd1da519

commit f84243d8dd

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