Fix merge conflicts
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
This commit is contained in:
commit
e2c88469d0
@ -50,11 +50,13 @@ phpMyAdmin - ChangeLog
|
||||
- issue #13557 Use a full list of functions instead of a separated one on insert/edit page "Function" selector
|
||||
- issue #14795 Include routines in the export in a predictable order
|
||||
|
||||
5.0.4 (not yet released)
|
||||
5.0.4 (2020-10-15)
|
||||
- issue #16245 Fix failed Zoom search clears existing values
|
||||
- issue Fixed a PHP error when reporting a particular JS error
|
||||
- issue #16326 Fixed latitude and longitude swap for geometries in edit mode
|
||||
- issue #16032 Fix CREATE TABLE not being tracked when auto tracking is enabled
|
||||
- issue #16397 Fix compatibility problems with older PHP versions (also issue #16399)
|
||||
- issue #16396 Fix broken two-factor authentication
|
||||
|
||||
5.0.3 (2020-10-09)
|
||||
- issue #15983 Require twig ^2.9
|
||||
@ -253,7 +255,9 @@ phpMyAdmin - ChangeLog
|
||||
- issue #15677 Fix show process-list triggers a php exception
|
||||
- issue #15697 Fix uncaught php error: "Call to a member function get() on null" in db_export.php when exporting a table from the list
|
||||
|
||||
4.9.7 (not yet released)
|
||||
4.9.7 (2020-10-15)
|
||||
- issue #16397 Fix compatibility problems with older PHP versions (also issue #16399)
|
||||
- issue #16396 Fix broken two-factor authentication
|
||||
|
||||
4.9.6 (2020-10-09)
|
||||
- issue [security] Fix XSS vulnerability with the transformation feature (PMASA-2020-5)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user