Merge branch 'master' into patch-1
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Wed, 17 Jun 2020 22:44:52 +0000 (00:44 +0200)
committerGitHub <noreply@github.com>
Wed, 17 Jun 2020 22:44:52 +0000 (00:44 +0200)
commit93404c6c1b3ead9080294f8233d164fca168c514
tree3692e408c47a19c0ecd61ac15837820ff8c83fa9
parentbb78789300e1d9b822a591b74473c02a028d88f1
parentbc9f7415b6958ef9163cd49afa180448219e7273
Merge branch 'master' into patch-1