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

This commit is contained in:
Weblate 2015-04-20 13:40:24 +02:00
commit db40caae2d
4 changed files with 6 additions and 4 deletions

View File

@ -1,7 +1,9 @@
phpMyAdmin - ChangeLog
======================
4.4.3.0 (not yet released)
4.4.4.0 (not yet released)
4.4.3.0 (2015-04-20)
- bug #4851 PHP errors in login dialogue
- bug #4845 White screen (Cloudflare)
- bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version

2
README
View File

@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
Version 4.4.3-dev
Version 4.4.4-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.4.3-dev'
version = '4.4.4-dev'
# The full version, including alpha/beta/rc tags.
release = version

View File

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