Merge remote-tracking branch 'origin/master'

2013-12-28 17:29:05 +01:00 · 2013-12-28 17:29:05 +01:00 · 415185a093
commit 415185a093
parent 5c09f55203 7248ffd46a
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================

 4.2.0.0 (not yet released)
+ rfe #1447 Single table for display Character Sets and Collations
 + rfe #1455 Display icons/text/both for the table row actions
 + rfe #1473 Transformation to convert Boolean value to text
 - bug #4157 Changing users password will delete it