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

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

diff --git a/ChangeLog b/ChangeLog
index 81fe456432..aab2a0be53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
 - issue #13099 Report error when trying to copy database to same name
 - issue #13167 Themes now have to contain metadata in theme.json
 - issue #6363  phpMyAdmin no longer requires eval() in PHP
+- issue #12386 The mbstring dependency is now optional
 
 4.7.1 (not yet released)
 - issue #13132 Always execute tracking queries as controluser