diff --git a/.gitignore b/.gitignore index dd6702d..2bc2c81 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -RELEASE_MESSAGE +RELEASE_MESSAGE* test* *.jpg diff --git a/CHANGELOG b/CHANGELOG index 04a4ab6..b81dc0b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ codebird-php - changelog ======================== -2.5.0 (not yet released) +2.5.0 (2014-06-20) + Add section about cacert.pem to README + Option to set cURL timeout + #42 Allow to get the supported API methods as array diff --git a/bower.json b/bower.json index 32f3382..b661975 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "codebird-php", - "version": "2.5.0-rc.3-dev", + "version": "2.5.0", "homepage": "http://www.jublo.net/projects/codebird/php", "authors": [ "Joshua Atkins ", diff --git a/src/codebird.php b/src/codebird.php index 80232dd..9dd4bb0 100644 --- a/src/codebird.php +++ b/src/codebird.php @@ -6,7 +6,7 @@ * A Twitter library in PHP. * * @package codebird - * @version 2.5.0-rc.3-dev + * @version 2.5.0 * @author Jublo Solutions * @copyright 2010-2014 Jublo Solutions * @@ -117,7 +117,7 @@ class Codebird /** * The current Codebird version */ - protected $_version = '2.5.0-rc.3-dev'; + protected $_version = '2.5.0'; /** * Request timeout