From d9e22cfba841b38321cf3119e1604e822d975ef9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 3 Apr 2013 12:29:47 -0400 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index d07620787f..4b166d47f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,8 @@ underscore - bug #3703 Incorrect updating of the list of users - bug #3853 Blowfish implementation might be broken (replace with phpseclib) +3.5.9.0 (not yet released) + 3.5.8.0 (not yet released) - bug #3828 MariaDB reported as MySQL - bug #3854 Incorrect header for Safari 6.0