Merge branch 'v2.5.x'

[m6w6/ext-http] / README.md

diff --git a/README.md b/README.md
index 43636a7efdfb96bf96ac7e47e9d26503e6f86ea4..473dc2f04a9dc06cdf11564f985cf602697d40e1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # 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?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/m6w6/ext-http](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/m6w6/ext-http)
+>>>>>>> v2.5.x
 
 Extended HTTP support. Again.