Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 256fcb61fe1e5053b7306764a4b54c305aaab643 https://github.com/phpmyadmin/phpmyadmin/commit/256fcb61fe1e5053b7306764a4b5... Author: Marc Delisle marc@infomarc.info Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths: M ChangeLog M index.php
Log Message: ----------- bug #4099 Server/library difference warning: setting is ignored
Commit: 668c55a437ee56e686c47389e29b6baa61255f16 https://github.com/phpmyadmin/phpmyadmin/commit/668c55a437ee56e686c47389e29b... Author: Marc Delisle marc@infomarc.info Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths: M ChangeLog M index.php
Log Message: ----------- Fix merge conflicts
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5b214d07e738...668c55a437ee