Merge branch 'master' into icons
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Tue, 10 Sep 2019 12:36:40 +0000 (14:36 +0200)
committerGitHub <noreply@github.com>
Tue, 10 Sep 2019 12:36:40 +0000 (14:36 +0200)
commitb1db0120945279789e10f17845163a60ffeeb409
treea3a889ce910877d71dcff43f5b3a10906bc48dec
parent654049d4fdaa9d9a600f19a2abd6b55af1851f4b
parent556e8d39aa807405b1d1715f68549d7b04d0d704
Merge branch 'master' into icons
client.qrc