Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6c42802118c5d9dfa48f7fe7554e5f4524cb01d6 https://github.com/phpmyadmin/phpmyadmin/commit/6c42802118c5d9dfa48f7fe7554e... Author: Michal Čihař michal@cihar.com Date: 2017-06-28 (Wed, 28 Jun 2017)

Changed paths: M test/classes/UtilTest.php

Log Message: ----------- Fix DarwinSSL detection

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

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

Changed paths: M test/classes/UtilTest.php

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a0d87a07cd63...0aae5bd2c775