Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2f248be86615c63888b89a9c95f1a5f45601e6e2 https://github.com/phpmyadmin/phpmyadmin/commit/2f248be86615c63888b89a9c95f1... Author: Michal Čihař michal@cihar.com Date: 2018-02-12 (Mon, 12 Feb 2018)

Changed paths: M libraries/Language.php

Log Message: ----------- Fix variable name

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 2f97da218329f259b46253ecbc731d6dd3f738e6 https://github.com/phpmyadmin/phpmyadmin/commit/2f97da218329f259b46253ecbc73... Author: Michal Čihař michal@cihar.com Date: 2018-02-12 (Mon, 12 Feb 2018)

Changed paths: M libraries/classes/Language.php

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9b36dfba699a...2f97da218329