Merge branch 'ls/travis-enable-httpd-tests' into maint
commitdbc5276fedbe5ac86951a054e6e8ae610f073d9d
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:22 +0000 (10 11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:23 +0000 (10 11:55 -0700)
tree810357e2e33d30ac8815fbca979628da6e372f1a
parentf98a20c50a52342556f0d71a83763a61a170c26c
parentd9d14268309469997d8a9df5320d24ce20d1ffb7
Merge branch 'ls/travis-enable-httpd-tests' into maint

Allow http daemon tests in Travis CI tests.

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