release 3.2.3

[m6w6/ext-http] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index b0aef47cbde05ad2cc0e39899c08abc18ef08d57..ffc24946fc8323688f7ea273e43f7dc87cca22ca 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
 package.xml            merge=touch
 php_http.h             merge=touch
+CHANGELOG.md   merge=touch
 .travis.yml            merge=touch
+/tests/data/bug71719.bin       -diff -text