Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 49c963542df3ada44bf369281cbea420513d7c59 https://github.com/phpmyadmin/phpmyadmin/commit/49c963542df3ada44bf369281cbe... Author: Michal Čihař michal@cihar.com Date: 2017-06-28 (Wed, 28 Jun 2017)

Changed paths: M test/classes/UtilTest.php

Log Message: ----------- Add tests for both paths in curl

Test both CURLOPT_CAPATH and URLOPT_CAINFO setup.

Fixes #13398

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 3e6f5f1847c15c74354dd925fc1e1ed17772c027 https://github.com/phpmyadmin/phpmyadmin/commit/3e6f5f1847c15c74354dd925fc1e... Author: Michal Čihař michal@cihar.com Date: 2017-06-28 (Wed, 28 Jun 2017)

Changed paths: M po/pt_BR.po M po/tr.po

Log Message: ----------- Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a2d71c5d2447...3e6f5f1847c1