Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2014-04-18 18:10:18 +0400
committerMarc Delisle <marc@infomarc.info>2014-04-18 18:10:18 +0400
commit2f35b7f23e4c139ab02eb3a79af3a4d5b84a56c8 (patch)
treec6256385907518560e4fab95658ec2395989870a
parentc8850eee2217470700c4a4b010478fccb6da8bba (diff)
4.2.0-beta1 releaseRELEASE_4_2_0BETA1
Signed-off-by: Marc Delisle <marc@infomarc.info>
-rw-r--r--README2
-rw-r--r--doc/conf.py2
-rw-r--r--libraries/Config.class.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index 4c8786f641..d49f07850c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.2.0-alpha2
+Version 4.2.0-beta1
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index ad4fa91911..64cbefe301 100644
--- 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.2.0-alpha2'
+version = '4.2.0-beta1'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index da74eb2d14..57aa313603 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -114,7 +114,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '4.2.0-alpha2');
+ $this->set('PMA_VERSION', '4.2.0-beta1');
/**
* @deprecated
*/