Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e75d6017ba954105200fefc46fff80ba74dfea4c https://github.com/phpmyadmin/phpmyadmin/commit/e75d6017ba954105200fefc46fff... Author: Thomas Staus thomasstaus@live-and-learn.eu Date: 2017-11-28 (Tue, 28 Nov 2017)

Changed paths: M po/en_GB.po

Log Message: ----------- Translated using Weblate (English (United Kingdom))

Currently translated at 98.7% (3237 of 3278 strings)

[CI skip]

Commit: 737a69e321de82d5e5b0709787fb3d5402ada2da https://github.com/phpmyadmin/phpmyadmin/commit/737a69e321de82d5e5b0709787fb... Author: Weblate noreply@weblate.org Date: 2017-11-28 (Tue, 28 Nov 2017)

Changed paths: R templates/display/import/charset.twig M templates/display/import/file_option.twig

Log Message: ----------- Merge remote-tracking branch 'origin/master'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b1490922346d...737a69e321de