From 8b3ac5f5e300404a37075469ea9dfb847f4ef42b Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Thu, 28 Jan 2016 23:31:39 -0500 Subject: [PATCH 1/2] Correct release date Signed-off-by: Isaac Bennetch --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e0ab224320..8794253161 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.0.10.14 (2015-01-28) +4.0.10.14 (2016-01-29) - issue #11891 Error with PMA 4.0.10.13 with PHP 5.2 4.0.10.13 (2016-01-28) From f1668937772688de3bbd707cee23ef8653756f32 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Thu, 28 Jan 2016 23:34:57 -0500 Subject: [PATCH 2/2] Release 4.0.10.14 Signed-off-by: Isaac Bennetch --- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 226cb0f191..8bc8a70fff 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.0.10.13 +Version 4.0.10.14 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 839316bf46..273acac23f 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.0.10.13' +version = '4.0.10.14' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f5e19979c4..36ea4087f6 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -102,7 +102,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.0.10.13'); + $this->set('PMA_VERSION', '4.0.10.14'); /** * @deprecated */