Merge branch 'origin/master' into Weblate
commit87a808265e60234764183dc5bf14835d54ec9716
authorHosted Weblate <hosted@weblate.org>
Sun, 16 Sep 2018 17:34:21 +0000 (16 19:34 +0200)
committerHosted Weblate <hosted@weblate.org>
Sun, 16 Sep 2018 17:34:21 +0000 (16 19:34 +0200)
treee4cd0c1d6e55fe158b7f8e510ce470582a62d707
parenta39cef2abd6ea3bea813415dab0556eae20b110c
parent960827e92ba4e801491b0438d51795cf73e3fa2d
Merge branch 'origin/master' into Weblate