Merge branch 'origin/master' into Weblate
commit781fc22113910f32477ff71d0845855e2f905008
authorHosted Weblate <hosted@weblate.org>
Sun, 16 Sep 2018 15:41:00 +0000 (16 17:41 +0200)
committerHosted Weblate <hosted@weblate.org>
Sun, 16 Sep 2018 15:41:00 +0000 (16 17:41 +0200)
treefdf1831f777f210ec21ad80a62d8e6e8beb7ed14
parent9ced0fd3a797e100dbc572857d34b319928e470c
parent3e71d1b7852331eb6f278634d4080750a50676e1
Merge branch 'origin/master' into Weblate