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>2015-05-13 18:06:36 +0300
committerMarc Delisle <marc@infomarc.info>2015-05-13 18:06:36 +0300
commitd81165f34555c5202d8150ae1d080834dd601d5b (patch)
treefea669b9a8ab676ff7161898e1304f3564dadadc
parente97e7fb0ea2dedfaa95c7dbe872027fb4bd4204c (diff)
4.0.10.10 releaseRELEASE_4_0_10_10
Signed-off-by: Marc Delisle <marc@infomarc.info>
-rw-r--r--ChangeLog2
-rw-r--r--README2
-rw-r--r--doc/conf.py2
-rw-r--r--libraries/Config.class.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e18b6545bf..bcdc67c689 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.0.10.10 (Not yet released)
+4.0.10.10 (2015-05-13)
- bug #4899 [security] CSRF vulnerability in setup
- bug #4900 [security] Vulnerability allowing Man-in-the-middle attack
diff --git a/README b/README
index 88ac3a3fed..8c0c0e1fea 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.0.10.9
+Version 4.0.10.10
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index 1ddff02fd1..cf9f771548 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team'
# built documents.
#
# The short X.Y version.
-version = '4.0.10.9'
+version = '4.0.10.10'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 9775535182..5093067c1f 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -102,7 +102,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '4.0.10.9');
+ $this->set('PMA_VERSION', '4.0.10.10');
/**
* @deprecated
*/