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)
commitead2131ba231ca917016b8ce677230b5b6549e19
tree4d1ae027315ef1656c4b0e3f12c1bbd0a737a659
parentcf1532acf18a7e9f530a42b100ec9a437a0057fd
parent17ca7ab5dbe07dab883f00d98002b58b1319090e
Merge branch 'master' of https://github.com/Milokita/desktop