From 62c6e73cc5601ecd6cf839874c038a991c7b5b97 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 25 Jan 2017 19:25:29 -0500 Subject: [PATCH 1/2] Prepare for 4.7.0-beta1 Signed-off-by: Isaac Bennetch --- README | 2 +- doc/conf.py | 2 +- libraries/Config.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 4ca5f4b3a1..df633ab299 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.7.0-dev +Version 4.7.0-beta1 A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index aa15008946..2f60bbdaa2 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2016, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.7.0-dev' +version = '4.7.0-beta1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.php b/libraries/Config.php index 8269b72179..1a0e543fa7 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -103,7 +103,7 @@ class Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.7.0-dev'); + $this->set('PMA_VERSION', '4.7.0-beta1'); /** * @deprecated */ From e93741caba1f6347a24d001842a73ddd6ec4fd8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 26 Jan 2017 08:39:07 +0100 Subject: [PATCH 2/2] Adjust Weblate configuration for 4.7 branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- .weblate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.weblate b/.weblate index 963984ece7..d71ff5a3f3 100644 --- a/.weblate +++ b/.weblate @@ -1,3 +1,3 @@ [weblate] url = https://hosted.weblate.org/api/ -translation = phpmyadmin/master +translation = phpmyadmin/4-7