Merge branch '2.2' into develop

Browse Source

No changes because of heavy conflicts. The features from 2.2 will be included
in a later commit.

...

This commit is contained in:

Esa Korhonen

2018-06-15 16:28:02 +03:00

parent 2005164222 09df017528

commit 037498675f

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