From: Michael Wallner <mike@php.net>
Date: Tue, 29 Sep 2015 07:03:45 +0000 (+0200)
Subject: Merge branch 'R_2_5'
X-Git-Tag: RELEASE_3_0_0_RC1~11
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=a5e66b221dbf5a52cc770f4d7f46f05fe88784ba;hp=b2a4f89e30c04a18ec0da23d2ff0c80c2dccf42e

Merge branch 'R_2_5'
---

diff --git a/README.md b/README.md
index 19738da..6d4a56b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # ext-http
 
 [![Build Status](https://travis-ci.org/m6w6/ext-http.svg?branch=master)](https://travis-ci.org/m6w6/ext-http)
+[![Join the chat at https://gitter.im/m6w6/ext-http](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/m6w6/ext-http)
 
 Extended HTTP support. Again.
 
diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 4bb37b7..e42ec31 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -44,3 +44,10 @@ after_script:
  - test -e tests/helper/server.log && cat tests/helper/server.log
 
 sudo: false
+notifications:
+ webhooks:
+  urls:
+   - https://webhooks.gitter.im/e/28d35158ac7e385bd14d
+  on_success: change
+  on_failure: always
+  on_start: never