Fix merge conflicts

This commit is contained in:
Marc Delisle 2013-02-15 07:26:32 -05:00
parent fb7d066c8e
commit 3b0323dda3

View File

@ -3,7 +3,7 @@ phpMyAdmin - ChangeLog
3.5.8.0 (not yet released)
3.5.7.0 (not yet released)
3.5.7.0 (2013-02-15)
- bug #3779 [core] Problem with backslash in enum fields
- bug #3816 Missing server_processlist.php
- bug #3821 Safari: white page