Merge branch '2.8' into 3.4

Browse Source

* 2.8:
  fix merge

...

This commit is contained in:

Nicolas Grekas 2018-05-16 10:49:53 +02:00

parent 86a9c73026 f49310b54c

commit bf2943ecd1

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