Merge branch 2.8, which is a "fake" merge

Browse source

git merge -s ours 2.8 : to avoid merging version number change

...

This commit is contained in:

plegall 2016-07-07 18:29:30 +02:00

parent ee737aeed7 374f341d0b

commit 6932344e72

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 is not available