Merge branch '2.1' into 3.0 3.0.final
authorMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:36:12 +0000 (13:36 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:36:12 +0000 (13:36 +0100)
commit8f6f92ad0c9aefb9c9d397d22a89964bc35844e0
tree58ed07c6c32b285939737774831e8f21076f9069
parent2cb1d8ecf0a27581499dcb87e291ea820ee11fbe
parent26a329dc55ba83d431be645707077cea7240f5ec
Merge branch '2.1' into 3.0