Fix merge conflicts

This commit is contained in:
Marc Delisle 2012-04-14 07:38:03 -04:00
parent 7738ec98e8
commit ea17cef342

View File

@ -76,7 +76,7 @@ phpMyAdmin - ChangeLog
- bug #3497151 [interface] Duplicate inline query edit box
- bug #3504567 [mime] Description of the transformation missing in the tooltip
3.4.11.0 (not yet released)
3.4.11.0 (2012-04-14)
- bug #3486970 [import] Exception on XML import
- bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation