administrativa [ci skip]

diff --git a/.gitattributes b/.gitattributes
index a55a7ae95546df79042da73d8e32162b575db1ff..b0aef47cbde05ad2cc0e39899c08abc18ef08d57 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 package.xml            merge=touch
 php_http.h             merge=touch
+.travis.yml            merge=touch

diff --git a/package.xml b/package.xml
index b3934e410a01cb52b2fa5466969b937446041860..d97a99f16c9e04470602746abc3f38196c7ef2c9 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -340,6 +340,8 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
   <required>
    <php>
     <min>5.3.0</min>
+    <max>7.0.0</max>
+       <exclude>7.0.0</exclude>
    </php>
    <pearinstaller>
     <min>1.4.1</min>