From 42a9a81cc05990c087e518c0f07e823dfb100634 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 20 Dec 2015 04:39:50 -0500 Subject: [PATCH] 4.5.4-dev Signed-off-by: Marc Delisle --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a3c5ce930..766ff283dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.5.4.0 (not yet released) + 4.5.3.0 (not yet released) - issue #11744 Incomplete results of UNION ALL - issue #11742 MATCH AGAINST keywords not recognized diff --git a/README b/README index 3b9b646dc6..ff8ab7af92 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.5.3-dev +Version 4.5.4-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index a868de5593..133e310fd6 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.5.3-dev' +version = '4.5.4-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 0bfdb0bd30..c811d7b21a 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.5.3-dev'); + $this->set('PMA_VERSION', '4.5.4-dev'); /** * @deprecated */