Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 999db1491c86bd669b1a8aad1c630159b577551b https://github.com/phpmyadmin/phpmyadmin/commit/999db1491c86bd669b1a8aad1c63... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M ChangeLog M libraries/Config.php Log Message: ----------- Fixed setting of language from user configuration Fixes #12202 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 22360b2a3b050edfb12d4a73f8ddab02b57deec7 https://github.com/phpmyadmin/phpmyadmin/commit/22360b2a3b050edfb12d4a73f8dd... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M ChangeLog M libraries/Config.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a0154623b5f2...22360b2a3b05