Merge branch 'master' of https://github.com/Milokita/desktop
authorXNG <Milokita@users.noreply.github.com>
Fri, 1 Nov 2019 01:35:19 +0000 (09:35 +0800)
committerXNG <Milokita@users.noreply.github.com>
Fri, 1 Nov 2019 01:35:19 +0000 (09:35 +0800)

Trivial merge