From 20d17644ef4d081feaca5b21485d40defc0df10d Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 10 Jul 2019 17:44:05 -0400 Subject: [PATCH] Prepare master for 5.1.0-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 4fb6a3e179..3448a75259 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +5.1.0 (not yet released) + 5.0.0 (not yet released) - issue #13896 Drop support for PHP 5.5, PHP 5.6, PHP 7.0 and HHVM - issue #14007 Enable columns names by default for CSV exports diff --git a/README b/README index ec8223405b..e0f9298765 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 5.0.0-dev +Version 5.1.0-dev A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 3b3301dc70..8ffec7f2be 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 = '5.0.0-dev' +version = '5.1.0-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 224c8d6af9..75a6ee565d 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -113,7 +113,7 @@ class Config */ public function checkSystem(): void { - $this->set('PMA_VERSION', '5.0.0-dev'); + $this->set('PMA_VERSION', '5.1.0-dev'); /* Major version */ $this->set( 'PMA_MAJOR_VERSION', diff --git a/package.json b/package.json index f0ed3465c6..89cdce349c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phpmyadmin", - "version": "5.0.0-dev", + "version": "5.1.0-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/)",