Merge branch '2.7' into 2.8

Browse Source

* 2.7:
  Fix merge

...

This commit is contained in:

Nicolas Grekas 2015-12-22 11:27:54 +01:00

parent d70ff0abd4 6755f87476

commit 6fa4d5b8f1

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

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

Diff Content Not Available