Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: a498a6c8cb73ca5aaec14f4857618c47081febe6
https://github.com/phpmyadmin/phpmyadmin/commit/a498a6c8cb73ca5aaec14f48576…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-10-06 (Sun, 06 Oct 2013)
Changed paths:
M ChangeLog
M index.php
M libraries/sqlparser.lib.php
Log Message:
-----------
bug #3995 Drizzle server charset notice
Commit: 99b477ffd4c46f9ce5cb58cca7fd27dd3c68af74
https://github.com/phpmyadmin/phpmyadmin/commit/99b477ffd4c46f9ce5cb58cca7f…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-10-06 (Sun, 06 Oct 2013)
Changed paths:
M ChangeLog
M index.php
M libraries/sqlparser.lib.php
Log Message:
-----------
Fix merge conflicts
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/a95a3f4cdb89...99b477ffd4c4