From cce1fa2735914a51ebb6f06505ed5f309a2bcec3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 4 Aug 2013 07:00:04 -0400 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8b52ee63f1..628bfbeeae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) - bug Missing hints when changing a column's structure -4.0.5.0 (not yet released) +4.0.5.0 (2013-08-04) - bug #3977 Not detected configuration storage - bug #3970 Pressing enter in the filter field reloads page - bug #3984 Cannot insert in this table (PHP < 5.4)