Merge branch 'master' into feature/remote-wipe
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Thu, 17 Oct 2019 20:05:20 +0000 (22:05 +0200)
committerGitHub <noreply@github.com>
Thu, 17 Oct 2019 20:05:20 +0000 (22:05 +0200)
commit32bb31a417fd4c782c1d463c1c56313921ddda43
tree6cc1462759283f1df1a747cc731f8af9c1bb5f37
parent19491ff85f3cd02952478d2ee1fb42caf252e9dd
parent87844f5ff4240283ed85602184b8902767d49441
Merge branch 'master' into feature/remote-wipe