diff options
author | Isaac Bennetch <bennetch@gmail.com> | 2018-04-19 17:06:27 +0300 |
---|---|---|
committer | Isaac Bennetch <bennetch@gmail.com> | 2018-04-19 17:06:27 +0300 |
commit | fc5992686e0407172e9f664ea74732e5891714cf (patch) | |
tree | a23f5a4bf04704be4afcc21c40ae33748d5f1127 /ChangeLog | |
parent | ea5c066d5ddc7eafcf74327185fd8e4fd3ca9f5d (diff) | |
parent | c6dd6b56e236a3aff953cee4135ecaa67130e641 (diff) |
Fix merge conflicts
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -8,6 +8,9 @@ phpMyAdmin - ChangeLog 4.8.1 (not yet released) +4.8.0.1 (not yet released) +- issue [security] Multiple CSRF vulnerabilities, See PMASA-2018-02 + 4.8.0 (2018-04-07) - issue #12946 Allow to export JSON with unescaped unicode chars - issue #12983 Disable login button without solved reCaptcha |