Fix merge conflict
This commit is contained in:
parent
9727db8647
commit
360a9f4a0c
@ -4,7 +4,7 @@ phpMyAdmin - ChangeLog
|
||||
3.5.7.0 (not yet released)
|
||||
- bug #3779 [core] Problem with backslash in enum fields
|
||||
|
||||
3.5.6.0 (not yet released)
|
||||
3.5.6.0 (2013-01-28)
|
||||
- bug #3593604 [status] Erroneous advisor rule
|
||||
- bug #3596070 [status] localStorage broken in server status monitor
|
||||
- bug #3598736 [routines] Editing a procedure with special characters
|
||||
|
||||
Loading…
Reference in New Issue
Block a user