From fb7e4f18e151ddba9c400b79f59bd4bc45a1ae5e Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 22 Aug 2018 09:48:23 -0400 Subject: [PATCH] Prepare for 4.8.4-dev Signed-off-by: Isaac Bennetch --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/classes/Config.php | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0acc4f5fc7..825a45ce36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.8.4 (not yet released) + 4.8.3 (2018-08-22) - issue #14314 Error when naming a database '0' - issue #14333 Fix NULL as default not shown diff --git a/README b/README index 10f5102d09..6b8c5f2532 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.8.3 +Version 4.8.4-dev A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 669ae7a9e6..080bb3a25b 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.3' +version = '4.8.4-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 41758bd5e9..c39c18dc0c 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.3'); + $this->set('PMA_VERSION', '4.8.4-dev'); /* Major version */ $this->set( 'PMA_MAJOR_VERSION', diff --git a/package.json b/package.json index 6c4bbdb3d5..f640c1c337 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phpmyadmin", - "version": "4.8.3", + "version": "4.8.4-dev", "description": "A web interface for MySQL and MariaDB", "repository": "https://github.com/phpmyadmin/phpmyadmin.git", "author": "The phpMyAdmin Team (https://www.phpmyadmin.net/team/)",