From b3d8ebad3fc2dcea89e87c0a77bb0cb84f76cec3 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Tue, 16 Aug 2016 21:35:12 -0400 Subject: [PATCH] Prepare for 4.6.5 Signed-off-by: Isaac Bennetch --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/Config.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a60f203aa..264c838ca6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.6.5 (not yet released) + 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 - issue [security] Improve session cookie code for openid.php and signon.php example files diff --git a/README b/README index b68c4c4bd9..6e7b903c38 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.6.4 +Version 4.6.5-dev A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index b13b14e1f2..e87f80a90c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2016, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.6.4' +version = '4.6.5-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.php b/libraries/Config.php index eaa493705a..c90bd1f3d3 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -101,7 +101,7 @@ class Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.6.4'); + $this->set('PMA_VERSION', '4.6.5-dev'); /** * @deprecated */