Merge branch '2.0' into 2.1 2.1.final
authorMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:36:01 +0000 (13:36 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:36:01 +0000 (13:36 +0100)
commit26a329dc55ba83d431be645707077cea7240f5ec
tree322601c3700af45ea5f67ba09aa39df2d24bd28c
parent0d89cb0909ba2b37379a162c08d11fd84690dabb
parent1af9d4d0c481504182a1895455158281ad690f16
Merge branch '2.0' into 2.1