Merge branch '2.8' into 3.2

Browse Source

* 2.8:
  fixed bad merge

...

This commit is contained in:

Fabien Potencier 2017-07-05 09:34:04 +03:00

parent 285a6ac36d d879eed12a

commit 8a7b7e4286

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