Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cd4c8374b12601af9e925c5a47dcff6524278996 https://github.com/phpmyadmin/phpmyadmin/commit/cd4c8374b12601af9e925c5a47dc... Author: Michal Čihař michal@cihar.com Date: 2016-10-04 (Tue, 04 Oct 2016)

Changed paths: M ChangeLog M libraries/Config.php

Log Message: ----------- Fixed regexp for matching browser versions

Fixes #12615

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

Commit: 7f35b62c06b90398098304013b8829a229d94daa https://github.com/phpmyadmin/phpmyadmin/commit/7f35b62c06b90398098304013b88... Author: Michal Čihař michal@cihar.com Date: 2016-10-04 (Tue, 04 Oct 2016)

Changed paths: M ChangeLog M libraries/Config.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f04aa22cc673...7f35b62c06b9