Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: 935dbf06afab041597da6032d4e22324f16934f9 https://github.com/phpmyadmin/scripts/commit/935dbf06afab041597da6032d4e2232... Author: Marc Delisle marc@infomarc.info Date: 2015-12-20 (Sun, 20 Dec 2015)

Changed paths: M demo/php/versions.ini

Log Message: ----------- New branch for testing

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: f342301e664c7db28d2f57f029e260d322687f53 https://github.com/phpmyadmin/scripts/commit/f342301e664c7db28d2f57f029e260d... Author: Marc Delisle marc@infomarc.info Date: 2015-12-20 (Sun, 20 Dec 2015)

Changed paths: M demo/maintenance/mysql-tester M demo/php/config-common.inc.php M demo/php/config-config-nopmadb.inc.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/scripts

Compare: https://github.com/phpmyadmin/scripts/compare/b153f0174286...f342301e664c