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

2017-08-24 16:56:46 +02:00 · 2017-08-24 16:56:46 +02:00 · 7904a40904
commit 7904a40904
parent 2c41aab400 748fac446b
5 changed files with 2277 additions and 4 deletions
--- a/4
+++ b/4
@ -1,7 +1,9 @@
 phpMyAdmin - ChangeLog
 ======================

-4.7.4 (not yet released)
+4.7.5 (not yet released)
+
+4.7.4 (2017-08-23)
 - issue #13415 Remove shadow from the logo
 - issue #13507 Fixed per server theme feature
 - issue #13523 Missing newline in ALTER exports
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================

-Version 4.7.4-dev
+Version 4.7.5-dev

 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.4-dev'
+version = '4.7.5-dev'
 # 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.4-dev');
+        $this->set('PMA_VERSION', '4.7.5-dev');
        /**
         * @deprecated
         */