Permalink
Browse files

Fix merge conflict

  • Loading branch information...
1 parent 71d5dab commit 857631f92fe5b218c609f7d7a3bf3664717c663d @lem9 lem9 committed Mar 29, 2013
Showing with 1 addition and 0 deletions.
  1. +1 −0 ChangeLog
View
@@ -105,6 +105,7 @@ underscore
- bug #3828 MariaDB reported as MySQL
- bug #3854 Incorrect header for Safari 6.0
- bug #3705 Attempt to open trigger for edit gives NULL
+- Use HTML5 DOCTYPE
3.5.7.0 (2013-02-15)
- bug #3779 [core] Problem with backslash in enum fields

0 comments on commit 857631f

Please sign in to comment.