3 Sep
2013
3 Sep
'13
3:16 p.m.
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 92f022caeb639c20a8bd2d83a34c991380011649
https://github.com/phpmyadmin/phpmyadmin/commit/92f022caeb639c20a8bd2d83a34…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M export.php
Log Message:
-----------
Fix merge conflicts