From 5d85c6d7687cfb52be620fbe98ab17b5fcaef961 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Thu, 24 May 2018 23:31:18 -0400 Subject: [PATCH] Prepare for 4.8.2-dev Signed-off-by: Isaac Bennetch --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/classes/Config.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f2c001cea..a7984f449f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.8.2 (not yet released) + 4.8.1 (2018-05-24) - issue #12772 Fix case where the central columns attributes don't get filled in - issue #14049 Fix case where the query builder doesn't work when selected column is * diff --git a/README b/README index 771f670e7b..95de165039 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.8.1 +Version 4.8.2-dev A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 5654a8310b..1e302f4386 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2018, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.8.1' +version = '4.8.2-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 225ca8b9ca..6faccb1b77 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -116,7 +116,7 @@ class Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.8.1'); + $this->set('PMA_VERSION', '4.8.2-dev'); /* Major version */ $this->set( 'PMA_MAJOR_VERSION',