Fix merge conflict

This commit is contained in:
Marc Delisle 2013-05-31 12:30:53 -04:00
parent 9d945e8a03
commit dc65f0c529

View File

@ -16,6 +16,8 @@ phpMyAdmin - ChangeLog
+ [interface] Upgraded CodeMirror to 3.x series
+ rfe #1363 Improved query profiler
4.0.4.0 (not yet released)
4.0.3.0 (not yet released)
- bug #3941 Recent tables list always empty
- bug #3933 Do not translate "Open Document" in export settings