Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

This commit is contained in:
Weblate 2015-11-16 13:25:14 +01:00
commit 633d6fde00
4 changed files with 5 additions and 3 deletions

View File

@ -1,6 +1,8 @@
phpMyAdmin - ChangeLog
======================
4.5.3.0 (not yet released)
4.5.2.0 (not yet released)
- issue #11589 Incorrect parameter in mysqli_fetch_fields()
- issue #11592 Missing headers in zipped export

2
README
View File

@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
Version 4.5.2-dev
Version 4.5.3-dev
A set of PHP-scripts to manage MySQL over the web.

View File

@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
# built documents.
#
# The short X.Y version.
version = '4.5.2-dev'
version = '4.5.3-dev'
# The full version, including alpha/beta/rc tags.
release = version

View File

@ -114,7 +114,7 @@ class PMA_Config
*/
public function checkSystem()
{
$this->set('PMA_VERSION', '4.5.2-dev');
$this->set('PMA_VERSION', '4.5.3-dev');
/**
* @deprecated
*/