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

2016-02-10 16:52:02 +01:00 · 2016-02-10 16:52:02 +01:00 · 57c66d1a5e
commit 57c66d1a5e
parent a1316ede8f 74ae9ab6d1
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================

-Version 4.6.0-dev
+Version 4.6.0-alpha

 A web interface for MySQL and MariaDB.

--- a/doc/conf.py
+++ b/doc/conf.py
@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.6.0-dev'
+version = '4.6.0-alpha'
 # The full version, including alpha/beta/rc tags.
 release = version

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