Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e0724d2660eedb35302d61466cb726182c7fcaf4 https://github.com/phpmyadmin/phpmyadmin/commit/e0724d2660eedb35302d61466cb7... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M ChangeLog M libraries/Util.php M libraries/dbi/DBIDummy.php M test/classes/UtilTest.php Log Message: ----------- Fixed check for ndb version Fixes #12200 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: d014c2893a60bdd8f37c751b5531bdbce00051ff https://github.com/phpmyadmin/phpmyadmin/commit/d014c2893a60bdd8f37c751b5531... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M ChangeLog M libraries/Util.php M libraries/dbi/DBIDummy.php M test/classes/UtilTest.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/22360b2a3b05...d014c2893a60