From cda4290749f10ed686bfb466b415e5e3a1c04fea Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Mon, 2 May 2016 21:53:57 -0400 Subject: [PATCH] Prepare for 4.6.2-dev Signed-off-by: Isaac Bennetch --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/Config.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index de60953946..9b25b5cfb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.6.2 (not yet released) + 4.6.1 (2016-05-02) - issue #12120 PMA_Util not found in insert_edit.lib.php - issue #12118 Fixed activation of some languages diff --git a/README b/README index 7cd4b56125..c3078e91b6 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.6.1 +Version 4.6.2-dev A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 9fd616e07e..eaac426277 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.6.1' +version = '4.6.2-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.php b/libraries/Config.php index 87455d5d93..2368312d56 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -101,7 +101,7 @@ class Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.6.1'); + $this->set('PMA_VERSION', '4.6.2-dev'); /** * @deprecated */