Merge branch '2.1' into 3.0
authorMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:30:19 +0000 (13:30 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:30:19 +0000 (13:30 +0100)
commit9f813cd6843bedb059bbcd375c59df69578f65fd
tree2f23ee4be2338cadaa5303f78f4d175864ba43ae
parentbed784e93786e4ca8ccb8dfcc25653d7f781ac17
parent3145f1ddc5079fd0c230d61fbe015e785a14a1fc
Merge branch '2.1' into 3.0