Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: 4d3fa9f96b826f3a2c1d5a9c9e22ceb80a99b93f https://github.com/phpmyadmin/scripts/commit/4d3fa9f96b826f3a2c1d5a9c9e22ceb... Author: Michal Čihař michal@cihar.com Date: 2015-07-07 (Tue, 07 Jul 2015)

Changed paths: M demo/php/index.php

Log Message: ----------- Update copyright

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

Commit: 243ef26b4f07963f228a59ee9c4528f728b05382 https://github.com/phpmyadmin/scripts/commit/243ef26b4f07963f228a59ee9c4528f... Author: Michal Čihař michal@cihar.com Date: 2015-07-07 (Tue, 07 Jul 2015)

Changed paths: M demo/php/index.php M demo/php/versions.ini

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

Conflicts: demo/php/index.php

Compare: https://github.com/phpmyadmin/scripts/compare/4cf30f6233fb...243ef26b4f07