From: Michael Wallner <mike@php.net>
Date: Tue, 1 Sep 2015 08:13:14 +0000 (+0200)
Subject: administrativa [ci skip]
X-Git-Tag: RELEASE_2_5_2~6
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=9862a9581510cb9539d5101e69712fc47aa92bfd

administrativa [ci skip]
---

diff --git a/.gitattributes b/.gitattributes
index a55a7ae..b0aef47 100644
--- 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 b3934e4..d97a99f 100644
--- 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>