From 08bbf7bdbdde5c4bd69c0010d8e0a5af8e4a079d Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Tue, 28 Mar 2017 20:58:44 -0400 Subject: [PATCH] Prepare for 4.7.0 Signed-off-by: Isaac Bennetch --- ChangeLog | 2 +- README | 2 +- doc/conf.py | 2 +- libraries/Config.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c24fab25d9..1123543d78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.7.0.0 (not yet released) +4.7.0 (2017-03-28) - patch #12233 [Display] Improve message when renaming database to same name - issue #6146 Log authentication attempts to syslog - issue #11981 Remove support for Swekey authentication diff --git a/README b/README index 65708eb01b..f23e316929 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.7.0-rc1 +Version 4.7.0 A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index af82eb0c15..d1294594d2 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2017, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.7.0-rc1' +version = '4.7.0' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.php b/libraries/Config.php index 38b548e56f..9f4c0e6005 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-rc1'); + $this->set('PMA_VERSION', '4.7.0'); /** * @deprecated */