Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f4ac05762fa2c49190910f7868547d7373bb7810 https://github.com/phpmyadmin/phpmyadmin/commit/f4ac05762fa2c49190910f786854... Author: Guilherme Rocha guilherme@candiba.net Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.3% (2995 of 3209 strings)
[CI skip]
Commit: 171bcb9a85bbb6ffb7d0a6c4b0cbdb5f7ded9387 https://github.com/phpmyadmin/phpmyadmin/commit/171bcb9a85bbb6ffb7d0a6c4b0cb... Author: Michal Čihař michal@cihar.com Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php
Log Message: ----------- Fix MySQL SSL connection with some PHP versions
It seems that for some PHP versions this flag is needed even though it's not documented like this. Anyway this flag doesn't cause any harm, so lets keep it enabled.
Issue #12293
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b211824dd6e13ca36848cfeeefea4b369f3903b7 https://github.com/phpmyadmin/phpmyadmin/commit/b211824dd6e13ca36848cfeeefea... Author: Michal Čihař michal@cihar.com Date: 2016-06-06 (Mon, 06 Jun 2016)
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6'
Commit: 8ee70dfa08b34af7bed3ab42dbdc62e6fd3bbcab https://github.com/phpmyadmin/phpmyadmin/commit/8ee70dfa08b34af7bed3ab42dbdc... Author: Michal Čihař michal@cihar.com Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/15155e3ff492...8ee70dfa08b3
-
Michal Čihař