diff options
| author | Isaac Bennetch <bennetch@gmail.com> | 2022-05-11 08:45:43 +0300 |
|---|---|---|
| committer | Isaac Bennetch <bennetch@gmail.com> | 2022-05-11 08:45:43 +0300 |
| commit | 7f22369812578194bd241a96b601258f04831d1d (patch) | |
| tree | fbc14aba06577ddcc19bd4b9f813e7aa2fd8ca07 /ChangeLog | |
| parent | 314f25110441a78c9e15113d0a9b0942ff5761f5 (diff) | |
| parent | f2d3767e286924017c2128b8df1d5e4b7414c8b2 (diff) | |
Fix merge conflicts
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -3,7 +3,9 @@ phpMyAdmin - ChangeLog 5.3.0 (not yet released) -5.2.0 (not yet released) +5.2.1 (not yet released) + +5.2.0 (2022-05-10) - issue #16521 Upgrade Bootstrap to version 5 - issue #16521 Drop support for Internet Explorer and others - issue Upgrade to shapefile 3 |