Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

2017-10-23 15:36:42 +02:00 · 2017-10-23 15:36:42 +02:00 · 0e33ea645f
commit 0e33ea645f
parent 4cdf2848ee 54103592d9
5 changed files with 2326 additions and 4 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================

-4.7.5 (not yet released)
+4.7.5 (2017-10-23)
 - issue #13615 Avoid problems with browsing unknown query types
 - issue #13612 Integrate tooltip into datetime pickers
 - issue #13628 Fixed javascript error in server monitor
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================

-Version 4.7.5-dev
+Version 4.7.5

 A web interface for MySQL and MariaDB.

--- a/composer.lock
+++ b/composer.lock
--- 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.5-dev'
+version = '4.7.5'
 # The full version, including alpha/beta/rc tags.
 release = version

--- a/libraries/Config.php
+++ b/libraries/Config.php
@ -103,7 +103,7 @@ class Config
     */
    public function checkSystem()
    {
-        $this->set('PMA_VERSION', '4.7.5-dev');
+        $this->set('PMA_VERSION', '4.7.5');
        /**
         * @deprecated
         */