Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 63c89d2e33d1b92804b9b1090a27d376dc0e68f4 https://github.com/phpmyadmin/phpmyadmin/commit/63c89d2e33d1b92804b9b1090a27... Author: Michal Čihař <michal@cihar.com> Date: 2016-05-11 (Wed, 11 May 2016) Changed paths: M ChangeLog M libraries/LanguageManager.php Log Message: ----------- Fixed setting mixed case languages Switched to use same code in both approaches to set language. Fixes #12118 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ea1693da036d9caadf632287c43c663b7209efbb https://github.com/phpmyadmin/phpmyadmin/commit/ea1693da036d9caadf632287c43c... Author: Michal Čihař <michal@cihar.com> Date: 2016-05-11 (Wed, 11 May 2016) Changed paths: M ChangeLog M libraries/LanguageManager.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/053b954c40a2...ea1693da036d