diff options
author | Marc Delisle <marc@infomarc.info> | 2012-04-25 20:29:55 +0400 |
---|---|---|
committer | Marc Delisle <marc@infomarc.info> | 2012-04-25 20:29:55 +0400 |
commit | 503e45aba5570c41fb4e9bad142f0a59b112cc1f (patch) | |
tree | d5994e13bb9e64fb075ba893ee53f3973d6ffd1a /ChangeLog | |
parent | d24ae82525a29f3be934d97742a09cb379a323c5 (diff) | |
parent | f76f0920a450a0c124fee86977dd29cc4e81640e (diff) |
Fix merge conflicts
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -36,6 +36,7 @@ phpMyAdmin - ChangeLog + Removed some directives: verbose_check, SuggestDBName, LightTabs - Patch #3500882 Fixing checkbox behaviour while editing identical rows + rfe #3441722 [interface] Display description of datatypes ++ rfe #3517835 [structure] Move columns easily 3.5.2.0 (not yet released) |