Merge branch 'master' into windows-large-app-icon
authorOskar Kruschitz <hiiamok@users.noreply.github.com>
Thu, 30 Aug 2018 05:42:34 +0000 (07:42 +0200)
committerGitHub <noreply@github.com>
Thu, 30 Aug 2018 05:42:34 +0000 (07:42 +0200)
commit964470fc1122d4491d0f1d6da7d5d7dcad397785
tree5c04c6a1bc1574ac5a4b3ceae3d167e78ba85457
parentbf35821bc03c0bd71d77f6972d55e294669977f4
parentc4d01b6aeafd5a02c11bd199ff4d4ba4ef4ccbf6
Merge branch 'master' into windows-large-app-icon