Fix merge conflicts

This commit is contained in:
Marc Delisle 2012-12-12 15:25:20 -05:00
parent 7a90141ec3
commit da0609d1ae

View File

@ -86,6 +86,7 @@ VerboseMultiSubmit, ReplaceHelpImg
- bug [core] Proxy ajax calls to pma.net to avoid browser notices
- bug #3593534 [tracking] Structure Snapshot on tracked view renders invalid
SQL
- bug #3544366 [events] Event comments not saved
3.5.4.0 (2012-11-16)
- bug #3570212 [edit] uuid_short() is a no-arguments function