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

This commit is contained in:
Weblate 2017-12-01 04:24:53 +01:00
commit bb0132f456
4 changed files with 6 additions and 4 deletions

View File

@ -1,7 +1,9 @@
phpMyAdmin - ChangeLog
======================
4.7.6 (not yet released)
4.7.7 (not yet released)
4.7.6 (2017-11-29)
- issue #13517 Fixed check all interaction with filtering
- issue #13803 Add SJIS-win to default list of allowed charsets
- issue #13436 Improve detection that MySQL server needs SSL connection

2
README
View File

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

View File

@ -51,7 +51,7 @@ copyright = u'2012 - 2017, The phpMyAdmin devel team'
# built documents.
#
# The short X.Y version.
version = '4.7.6-dev'
version = '4.7.7-dev'
# 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.6-dev');
$this->set('PMA_VERSION', '4.7.7-dev');
/**
* @deprecated
*/