Merge branch 'v2.6.x'

[m6w6/ext-http] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index a55a7ae95546df79042da73d8e32162b575db1ff..715993274e64dc0ea64acddd9c2faa567e2e5a9b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,4 @@
 package.xml            merge=touch
 php_http.h             merge=touch
+.travis.yml            merge=touch
+/tests/data/bug71719.bin       -diff -text