Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0c704996fa5dfa51252d5c6f8f3d4045428a20ba https://github.com/phpmyadmin/phpmyadmin/commit/0c704996fa5dfa51252d5c6f8f3d... Author: Nisarg Jhaveri <nisargjhaveri@gmail.com> Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M test/bootstrap-dist.php M test/classes/PMA_Util_test.php Log Message: ----------- Fix tests, use proxy settings from env Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com> Commit: 135289ca25597fbd3f3aa5e84feaa96b34e42f03 https://github.com/phpmyadmin/phpmyadmin/commit/135289ca25597fbd3f3aa5e84fea... Author: Marc Delisle <marc@infomarc.info> Date: 2015-07-02 (Thu, 02 Jul 2015) Changed paths: M test/bootstrap-dist.php M test/classes/PMA_Util_test.php Log Message: ----------- Merge pull request #1773 from nisargjhaveri/tests Fix tests, use proxy settings from env Compare: https://github.com/phpmyadmin/phpmyadmin/compare/89b75b3a4e94...135289ca2559