Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c0bd19cfbb61b2986a1b034c4398b09d47647b6a https://github.com/phpmyadmin/phpmyadmin/commit/c0bd19cfbb61b2986a1b034c4398... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-06 (Tue, 06 Jun 2017) Changed paths: M ChangeLog M libraries/common.inc.php Log Message: ----------- Fixed check for mbstring.func_overload It can be also empty string when disabled (at least on HHVM). Fixes #13316 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: bfdeb8904d9f4f9095ce12d520de814905786882 https://github.com/phpmyadmin/phpmyadmin/commit/bfdeb8904d9f4f9095ce12d520de... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-06 (Tue, 06 Jun 2017) Changed paths: M ChangeLog M libraries/common.inc.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2da1ebc4a886...bfdeb8904d9f