Merge branch 'origin/master' into Weblate
commit905f80b1ce892bf88e686f5e803223d57f87e745
authorHosted Weblate <hosted@weblate.org>
Thu, 13 Sep 2018 22:09:53 +0000 (14 00:09 +0200)
committerHosted Weblate <hosted@weblate.org>
Thu, 13 Sep 2018 22:09:53 +0000 (14 00:09 +0200)
tree448bb5e96434ff68e750efded3c12a1823f6ef80
parente707cc30adfe3a5b094f1095e80b5849f46a8609
parent4ef1fa77f8584e2d1afb1c3dcd776c89e9513448
Merge branch 'origin/master' into Weblate