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-03-22 21:05:06 +0400
committerMarc Delisle <marc@infomarc.info>2014-03-22 21:05:06 +0400
commite6c925ddd524e0e09e355d02876d14ce94ed78c3 (patch)
treebb8fefc42f6ea6c67235a286014cfc3b6cac2904
parentad9fcbe9fe417dbaf9a22bb686fb898c8c91b833 (diff)
4.1.11 releaseRELEASE_4_1_11
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 1e821166cf..4da698ee4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.1.11.0 (not yet released)
+4.1.11.0 (2014-03-23)
- bug #4335 reCaptcha problem (4.1.10 regression)
4.1.10.0 (2014-03-22)
diff --git a/README b/README
index b0ba433738..1fa9284b8b 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.1.11-dev
+Version 4.1.11
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index 07e54cc28d..763c8ce69a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
# built documents.
#
# The short X.Y version.
-version = '4.1.11-dev'
+version = '4.1.11'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index d543f81b9d..c52ed90f59 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.1.11-dev');
+ $this->set('PMA_VERSION', '4.1.11');
/**
* @deprecated
*/