Merge branch 'origin/master' into Weblate
authorHosted Weblate <hosted@weblate.org>
Fri, 5 Oct 2018 17:33:13 +0000 (19:33 +0200)
committerHosted Weblate <hosted@weblate.org>
Fri, 5 Oct 2018 17:33:13 +0000 (19:33 +0200)
commit13cb90125fec55458e7384c51e69600c295067bc
tree34e1e93c6a2be3335cf009ccb8e9b9190abed882
parent779e82a3a1b2e4f6300b8c8f90596f8790e05a64
parentae38dd31e145f4e03a5e03bdb1c72ad8018a7963
Merge branch 'origin/master' into Weblate