Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 469d6242e7c24c9344eab623dd94c9f2645e1858
https://github.com/phpmyadmin/phpmyadmin/commit/469d6242e7c24c9344eab623dd9…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-01-03 (Fri, 03 Jan 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Add ChangeLog entry for fix of bug #4184
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 3fc8321624ca4a4fd7d0eeeeb197ac5df817e64f
https://github.com/phpmyadmin/phpmyadmin/commit/3fc8321624ca4a4fd7d0eeeeb19…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-01-03 (Fri, 03 Jan 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/35e93ef92aca...3fc8321624ca