From 6d5af1b97d2617906e2f90cc5caf8f77121796ec Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Fri, 25 Jan 2019 22:43:24 -0500 Subject: [PATCH] Prepare for 4.8.6-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 9d8e457d1e..795d2de7cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.8.6 (not yet released) + 4.8.5 (2019-01-25) - issue Developer debug data was saved to the PHP error log - issue #14217 Fix issue when adding user on MySQL 8.0.11 diff --git a/README b/README index ba8808620f..aa2fcce6bf 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.8.5 +Version 4.8.6-dev A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 93f64c8cbc..59b9b41b81 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.5' +version = '4.8.6-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 74a3d9d03a..3c2e61a64e 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.5'); + $this->set('PMA_VERSION', '4.8.6-dev'); /* Major version */ $this->set( 'PMA_MAJOR_VERSION', diff --git a/package.json b/package.json index 942283353a..8531f861e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phpmyadmin", - "version": "4.8.5", + "version": "4.8.6-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/)",