From d8b3f9a7664b26acf55546d1a7b296f44e38cced Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 26 Jun 2014 10:01:48 -0400 Subject: [PATCH] 4.2.6-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 70c6169720..a78ae6ee2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.2.6.0 (not yet released) + 4.2.5.0 (not yet released) - bug #4467 shell_exec() has been disabled for security reasons - bug #4470 Error while submitting empty query diff --git a/README b/README index 9b60db21f4..568498be65 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.5-dev +Version 4.2.6-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index a04674dc2d..44ac20ded4 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.2.5-dev' +version = '4.2.6-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 068cfb1603..d44304e20b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.2.5-dev'); + $this->set('PMA_VERSION', '4.2.6-dev'); /** * @deprecated */