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

This commit is contained in:
Weblate 2017-06-29 21:22:11 +02:00
commit 9bc46b72c6
5 changed files with 2276 additions and 4 deletions

View File

@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
4.7.2 (not yet released)
4.7.2 (2017-06-29)
- issue #13314 Make theme selection keep current server
- issue #13311 Fixed direct login for accounts without password
- issue #13316 Fixed check for mbstring.func_overload

2
README
View File

@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
Version 4.7.2-dev
Version 4.7.2
A web interface for MySQL and MariaDB.

2272
composer.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -103,7 +103,7 @@ class Config
*/
public function checkSystem()
{
$this->set('PMA_VERSION', '4.7.2-dev');
$this->set('PMA_VERSION', '4.7.2');
/**
* @deprecated
*/