Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:36:21 +0000 (13:36 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:36:21 +0000 (13:36 +0100)
commit3a4de7f606dae09827b7e976644fd660f034c132
tree7b8b8ce07f5770c5a5286c34f0f3b1d0ed6df96f
parent8397af8013b590b994bfbda4bc5cbae6dc2cbc86
parent8f6f92ad0c9aefb9c9d397d22a89964bc35844e0
Merge branch '3.0'