Merge branch 'origin/master' into Weblate
commitc2b09df11862e4da0d8a7b14a7779f9f82e25187
authorHosted Weblate <hosted@weblate.org>
Wed, 12 Sep 2018 22:48:49 +0000 (13 00:48 +0200)
committerHosted Weblate <hosted@weblate.org>
Wed, 12 Sep 2018 22:48:49 +0000 (13 00:48 +0200)
treecec842e05db03de42a2e72a6338d9702ba84b2a2
parent9957e1834eab5a8586766854b9b64ade7b42df6c
parent7e537d819abd7c0b24553c4414a3fa27228302fc
Merge branch 'origin/master' into Weblate