Fix merge conflicts

This commit is contained in:
Marc Delisle 2013-04-08 07:59:38 -04:00
parent 4e8c8d7196
commit 25748dbad9

View File

@ -3,7 +3,7 @@ phpMyAdmin - ChangeLog
3.5.9.0 (not yet released)
3.5.8.0 (not yet released)
3.5.8.0 (2013-04-08)
- bug #3828 MariaDB reported as MySQL
- bug #3854 Incorrect header for Safari 6.0
- bug #3705 Attempt to open trigger for edit gives NULL