Skip to content
Browse files

Fix merge conflicts

  • Loading branch information...
1 parent 4e8c8d7 commit 25748dbad95a2fd4724762441680975a4db1306a @lem9 lem9 committed Apr 8, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 ChangeLog
View
2 ChangeLog
@@ -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

0 comments on commit 25748db

Please sign in to comment.
Something went wrong with that request. Please try again.