]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
projects / thirdparty / apache / httpd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c8b2b80) | patch
Merge r1875471, r1875472 from trunk:
authorJoe Orton <jorton@apache.org>
Fri, 20 Mar 2020 12:15:59 +0000 (12:15 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 20 Mar 2020 12:15:59 +0000 (12:15 +0000)
commit462a0bc7c86e652a4c6d5ed3921b24dcfb27995b
tree59185daef6664576dca7f9b8f54a5bc3f1d7ab8etree | snapshot
parentc8b2b80e62f897d3591c3cde435fb00cfbe8b91acommit | diff
Merge r1875471, r1875472 from trunk:

Fix Travis trunk/master confusion, and make the i386 build
trunk-only, it has not been adjusted to find PCRE "v1" i386 packages.

Fix the travis syntax (should have done it in a PR...).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1875474 13f79535-47bb-0310-9956-ffa450edef68
.travis.yml diff | blob | blame | history
Mirror of https://github.com/apache/httpd.git