Merge 2019.12 master into develop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 23 Dec 2019 19:00:12 +0000 (20:00 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 23 Dec 2019 19:00:12 +0000 (20:00 +0100)
commitc9036cdc4d645988d9df591a780ec15c7dd1e7e8
treecf9614a84b4aa9c902ce1d54b12af5568dcf3791
parent07143841d282158ccc6dc53fb7ab5cad296f2de9
parent98e9cc7dc28889ac35327f8679ab59f99a35e0d5
Merge 2019.12 master into develop