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

phpmyadmin · Jan 24, 2015 · 8fdccb4 · 8fdccb4
2 parents 1b3fb67 + 1318786
commit 8fdccb4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,9 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.3.8.0 (not yet released)
+4.3.9.0 (not yet released)
+
+4.3.8.0 (2015-01-24)
 - bug       Undefined constant PMA_DRIZZLE
 - bug #4712 Wrongly positioned date-picker while Grid-Editing
 - bug #4714 Forced ORDER BY for own sql statements

diff --git a/README b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.3.8-dev
+Version 4.3.9-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 

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

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
@@ -114,7 +114,7 @@ function __construct($source = null)
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.3.8-dev');
+        $this->set('PMA_VERSION', '4.3.9-dev');
         /**
          * @deprecated
          */