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:
authorIsaac Bennetch <bennetch@gmail.com>2016-05-03 00:13:27 +0300
committerIsaac Bennetch <bennetch@gmail.com>2016-05-03 00:13:27 +0300
commit07fd0bce678e83d5f81d7a683f1052fe45764d0c (patch)
tree11bba17c448893d9fe8c5fcdc1de089b14c4b4b0
parentb2f77691e915feb3aed02862f6d559a1f4645c85 (diff)
4.6.1 releaseRELEASE_4_6_1
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
-rw-r--r--ChangeLog2
-rw-r--r--README2
-rw-r--r--doc/conf.py2
-rw-r--r--libraries/Config.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3202b554d2..de60953946 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.6.1 (not yet released)
+4.6.1 (2016-05-02)
- issue #12120 PMA_Util not found in insert_edit.lib.php
- issue #12118 Fixed activation of some languages
- issue #12121 Fixed error in 3NF step of normalization
diff --git a/README b/README
index 8707dd3106..7cd4b56125 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.6.1-dev
+Version 4.6.1
A web interface for MySQL and MariaDB.
diff --git a/doc/conf.py b/doc/conf.py
index 07617799e0..9fd616e07e 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.6.1-dev'
+version = '4.6.1'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.php b/libraries/Config.php
index 823b3389fa..87455d5d93 100644
--- a/libraries/Config.php
+++ b/libraries/Config.php
@@ -101,7 +101,7 @@ class Config
*/
public function checkSystem()
{
- $this->set('PMA_VERSION', '4.6.1-dev');
+ $this->set('PMA_VERSION', '4.6.1');
/**
* @deprecated
*/