Merge branch 'origin/master' into Weblate
commit8749be910389b9bbb2b737300ce128cc0d4c06e3
authorHosted Weblate <hosted@weblate.org>
Sat, 15 Sep 2018 11:40:38 +0000 (15 13:40 +0200)
committerHosted Weblate <hosted@weblate.org>
Sat, 15 Sep 2018 11:40:38 +0000 (15 13:40 +0200)
tree6058eff2c91c4cba3b842770a4a32b9b33c800e7
parent7432459c93cb22449b3b58f7ab266d621cadc56c
parent6f9f49a43580d5def2a3df54da2b4c6e57948d0b
Merge branch 'origin/master' into Weblate