Fix merge conflicts

This commit is contained in:
Marc Delisle 2012-09-24 07:19:11 -04:00
parent 25e8815f36
commit e46884a15a

View File

@ -45,6 +45,8 @@ VerboseMultiSubmit, ReplaceHelpImg
+ rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table
+ [interface] Autoselect username input on cookie login page
3.5.4.0 (not yet released)
3.5.3.0 (not yet released)
- bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore
- bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done