[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f36fbf: Bug #4258 Grid editing broken
Marc Delisle
marc at infomarc.info
Wed Jan 29 14:12:05 CET 2014
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: f36fbfd4c6fde0aa771e8e51de09de2b34e4ecb1
https://github.com/phpmyadmin/phpmyadmin/commit/f36fbfd4c6fde0aa771e8e51de09de2b34e4ecb1
Author: Marc Delisle <marc at infomarc.info>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M libraries/Util.class.php
M libraries/sql.lib.php
Log Message:
-----------
Bug #4258 Grid editing broken
Signed-off-by: Marc Delisle <marc at infomarc.info>
Commit: 8cdb92be5a309c7d75ed5352595764ae3e27eff3
https://github.com/phpmyadmin/phpmyadmin/commit/8cdb92be5a309c7d75ed5352595764ae3e27eff3
Author: Marc Delisle <marc at infomarc.info>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M libraries/Util.class.php
M libraries/sql.lib.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc at infomarc.info>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3b684066afb5...8cdb92be5a30
More information about the Git
mailing list