Fix merge conflicts

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
This commit is contained in:
Isaac Bennetch 2021-02-24 01:38:26 -05:00
commit e694793507

View File

@ -9,7 +9,9 @@ phpMyAdmin - ChangeLog
- issue Upgrade phpseclib to version 3
- issue Upgrade Symfony components to version 5.2
5.1.0 (not yet released)
5.1.1 (not yet released)
5.1.0 (2021-02-24)
- issue #15350 Change Media (MIME) type references to Media type
- issue #15377 Add a request router
- issue Automatically focus input in the two-factor authentication window
@ -109,8 +111,6 @@ phpMyAdmin - ChangeLog
- issue #16667 Fixed LIKE and TINYINT in search not working properly
- issue #16424 Fixed numerical search in table and zoom
- issue Improve the version handling (new Version class) and add a VERSION_SUFFIX for vendors
5.0.5 (not yet released)
- issue #14494 Fix uncaught TypeError when editing partitioning
- issue #16525 Fix PHP 8.0 failing tests when comparing 0 to ''
- issue #16429 Fixed PHP 8.0 errors on preg_replace and operand types