From a78b963025b62b9a44dc09a8def71dbe75e6dea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 28 Jun 2017 16:02:24 +0200
Subject: [PATCH] Changelog entry for #12944 and #13317
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index efb95dd95c..6fc7f7a8d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog
 - issue #12899 Improved rendering of server variables table
 - issue #12948 Fixed javascript editor for TIME values
 - issue #13095 Fixed alignmnet of foreign keys editing
+- issue #12944 Improved inline editor for JSON
 
 4.7.2 (not yet released)
 - issue #13314 Make theme selection keep current server