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

phpmyadmin · Feb 10, 2016 · a6ecc52 · a6ecc52
2 parents c06ebed + c90d5a7
commit a6ecc52
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.6.0-alpha
+Version 4.6.0-alpha1
 
 A web interface for MySQL and MariaDB.
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -51,7 +51,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.6.0-alpha'
+version = '4.6.0-alpha1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/libraries/Config.php b/libraries/Config.php
@@ -101,7 +101,7 @@ public function __construct($source = null)
      */
     public function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.6.0-alpha');
+        $this->set('PMA_VERSION', '4.6.0-alpha1');
         /**
          * @deprecated
          */