Fix merge conflicts

This commit is contained in:
Marc Delisle 2013-05-21 08:31:41 -04:00
parent 36fe6f404c
commit 4dc859e11d

View File

@ -15,6 +15,8 @@ phpMyAdmin - ChangeLog
+ rfe #1423 Clarify option text for icon/text settings
+ [interface] Upgraded CodeMirror to 3.x series
4.0.3.0 (not yet released)
4.0.2.0 (not yet released)
- bug #3902 Cannot browse when table name contains keyword "call"
+ center loading indicator for navigation refresh, related to bug #3920