Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: f6b7f98322e51188011195c06dd0946dbb70040b
https://github.com/phpmyadmin/phpmyadmin/commit/f6b7f98322e51188011195c06dd…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths:
M libraries/Util.class.php
M libraries/plugins/export/ExportSql.class.php
M test/classes/plugin/export/PMA_ExportSql_test.php
M test/libraries/common/PMA_quoting_slashing_test.php
Log Message:
-----------
Fix merge conflicts
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: f6bafdc45e9478768265454e9f88e21c3b01b0ed
https://github.com/phpmyadmin/phpmyadmin/commit/f6bafdc45e9478768265454e9f8…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/3be2f44e3a11...f6bafdc45e94