Fix merge conflicts

This commit is contained in:
Marc Delisle 2013-04-03 12:29:47 -04:00
parent a0a3a5e7d6
commit d9e22cfba8

View File

@ -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