Merge branch 'develop'

jublo · Oct 12, 2014 · c767eab · c767eab
2 parents 07d3e5e + c9821b2
commit c767eab
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,7 @@
 codebird-php - changelog
 ========================
 
-2.6.0 (not yet released)
+2.6.0 (2014-10-12)
 + #67 Don't require cURL, allow stream connections too
 + Use default timeout
 + #69 Add composer/installers to allow install path changes