Merge branch '2.8'

Browse Source

"git merge -s ours 2.8" won't really apply change on version number introduced in 9f15161b62

...

This commit is contained in:

plegall

2016-03-10 20:42:18 +01:00

parent a32c643cf2 9f15161b62

commit 8cfee1dbc5

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