From 8fbd20ba31dd55d73fb10bc9aad47de92cce6d84 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Sat, 23 Nov 2019 06:48:13 -0500 Subject: [PATCH] Prepare for version 4.9.3-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 33587eed0c..b73a3851a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.9.3 (not yet released) + 4.9.2 (2019-11-21) - issue #14184 Change the cookie name from phpMyAdmin to phpMyAdmin_https for HTTPS, fixes many "Failed to set session cookie" errors - issue #15304 Fix ssl_use php error diff --git a/README b/README index 81a4661a9b..77bc76efa8 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.9.2 +Version 4.9.3-dev A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index ad5ede6bee..e6ff04538b 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.9.2' +version = '4.9.3-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index c70e18dc3e..30b52ca05e 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.9.2'); + $this->set('PMA_VERSION', '4.9.3-dev'); /* Major version */ $this->set( 'PMA_MAJOR_VERSION', diff --git a/package.json b/package.json index 0a1a76702b..302c0c6f07 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phpmyadmin", - "version": "4.9.2", + "version": "4.9.3-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/)",