Merge branch 'master' into windows-large-app-icon
authorOskar Kruschitz <hiiamok@users.noreply.github.com>
Wed, 5 Sep 2018 11:24:08 +0000 (13:24 +0200)
committerGitHub <noreply@github.com>
Wed, 5 Sep 2018 11:24:08 +0000 (13:24 +0200)
commitcf150caa2be6125e60b3484475c13c230d7af087
tree0dca7af956bb4156b3d67a989a4db22186fbcb3b
parentf4a704164fe26590e77cc9e9ab7e275aee026e48
parent23d276021e42382e5ed9c2137657eb539933a8f8
Merge branch 'master' into windows-large-app-icon