Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@lem9
lem9 committed Apr 8, 2013
1 parent c19e71e commit f371ce5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ChangeLog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ underscore

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
Expand Down

0 comments on commit f371ce5

Please sign in to comment.