Merge branch 'ls/travis-enable-httpd-tests'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:39 +0000 (14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:40 +0000 (14:13 -0700)
commit976809a8e202d40bc32adc4fff0c0b5056f89fca
tree00bc133028d3b537b2283e8a9aa01d2e48d12dc0
parent21bed620cd2d4fc4fb3d42447136c9f899ede5bb
parentd9d14268309469997d8a9df5320d24ce20d1ffb7
Merge branch 'ls/travis-enable-httpd-tests'

Allow http daemon tests in Travis CI tests.

* ls/travis-enable-httpd-tests:
  travis-ci: enable web server tests t55xx on Linux
.travis.yml