Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2014-08-17 12:48:09 -04:00
commit 8ee9b58d90

View File

@ -45,6 +45,7 @@ phpMyAdmin - ChangeLog
- bug #4503 [security] Self-XSSes in monitor
- bug #4504 [security] Self-XSS in query charts
- bug #4505 [security] XSS in view operations page
- bug #4517 [security] XSS in relation view
4.2.7.0 (2014-07-31)
- bug Broken links on home page