Merge branch 'QA_4_6'

2016-05-11 11:39:55 +02:00 · 2016-05-11 11:39:55 +02:00 · 06da17077c
commit 06da17077c
parent b24347ca8f 599f1d2455
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
 4.6.2 (not yet released)
 - issue #12225 Use https for documentation links
 - issue #12234 Fix schema export with too many tables
+- issue #12240 Avoid parsing non JSON responses as JSON

 4.6.1 (2016-05-02)
 - issue #12120 PMA_Util not found in insert_edit.lib.php