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

phpmyadmin · Jun 8, 2014 · e78abd4 · e78abd4
2 parents 82e6828 + 199982f
commit e78abd4
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.2.3.0 (not yet released)
+4.2.4.0 (not yet released)
+
+4.2.3.0 (2014-06-08)
 - bug #4423 Moving fields not working
 - bug #4424 Table indexes disappear after altering field
 - bug #4432 Error while displaying chart at server level

diff --git a/README b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.2.3-dev
+Version 4.2.4-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.2.3-dev'
+version = '4.2.4-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.2.3-dev');
+        $this->set('PMA_VERSION', '4.2.4-dev');
         /**
          * @deprecated
          */