projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge branch 'v2.5.x'
[m6w6/ext-http]
/
README.md
diff --git
a/README.md
b/README.md
index 2b505d5bf6b2decc9e32383df2dbd22f4ef3dc5b..473dc2f04a9dc06cdf11564f985cf602697d40e1 100644
(file)
--- a/
README.md
+++ b/
README.md
@@
-1,7
+1,8
@@
# ext-http
# ext-http
-[![Build Status](https://travis-ci.org/m6w6/ext-http.svg?branch=
v2.5.x
)](https://travis-ci.org/m6w6/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)
[![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.
Extended HTTP support. Again.