Merge branch 'origin/master' into Weblate
commite17d7d4a8feeb3b2e6a913ee0824117b068d4bc2
authorHosted Weblate <hosted@weblate.org>
Sat, 22 Sep 2018 10:43:45 +0000 (22 12:43 +0200)
committerHosted Weblate <hosted@weblate.org>
Sat, 22 Sep 2018 10:43:45 +0000 (22 12:43 +0200)
tree6041eb6ea6a98854fb1b9fac0a5d5ce075be0f33
parent65b74b146db28d6b9c97436966981f3604c92726
parentb937b9f2cb85a2a5c7b079b301e90b0ab73183fb
Merge branch 'origin/master' into Weblate