Merge branch 'origin/master' into Weblate.
commita8634885ce1405f20a56c1b0482e3b43aaef16f2
authorHosted Weblate <hosted@weblate.org>
Wed, 30 Jan 2019 18:23:07 +0000 (30 19:23 +0100)
committerHosted Weblate <hosted@weblate.org>
Wed, 30 Jan 2019 18:23:07 +0000 (30 19:23 +0100)
tree6531df11762d04c4239f1b14bb726b3842e740c0
parent845e94356867fd087867d723f1c972d84bdcea9a
parentd4b3420416004cc2982b4748f4c15c6b3f708105
Merge branch 'origin/master' into Weblate.

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: