Merge branch 'origin/master' into Weblate.
commit368f6f22ffc181315e35f1c865c05968225f83ce
authorHosted Weblate <hosted@weblate.org>
Tue, 15 Jan 2019 01:53:10 +0000 (15 02:53 +0100)
committerHosted Weblate <hosted@weblate.org>
Tue, 15 Jan 2019 01:53:10 +0000 (15 02:53 +0100)
tree2a5274e01ef47358fb0d29c4eaf045a8b5c6f89a
parent036a1877aec8dfa39a6dd474ae71d4398e1d2046
parent3f3a64bb60c9474bf831f302e21ced09440c6787
Merge branch 'origin/master' into Weblate.

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: