Merge branch 'release/1.2.5'

pronamic · Feb 1, 2016 · bcf7f57 · bcf7f57
2 parents d9ea57e + a9e64a6
commit bcf7f57
Show file tree

Hide file tree

Showing 12 changed files with 111 additions and 92 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com/).
 
 ## [Unreleased][unreleased]
+-
+
+## [1.2.5] - 2016-02-01
 - Added an gateway settings class.
 
 ## [1.2.4] - 2015-10-19
@@ -29,7 +32,9 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## 1.0.0 - 2015-01-19
 - First release.
 
-[unreleased]: https://github.com/wp-pay-gateways/icepay/compare/1.2.3...HEAD
+[unreleased]: https://github.com/wp-pay-gateways/icepay/compare/1.2.5...HEAD
+[1.2.5]: https://github.com/wp-pay-gateways/icepay/compare/1.2.4...1.2.5
+[1.2.4]: https://github.com/wp-pay-gateways/icepay/compare/1.2.3...1.2.4
 [1.2.3]: https://github.com/wp-pay-gateways/icepay/compare/1.2.2...1.2.3
 [1.2.2]: https://github.com/wp-pay-gateways/icepay/compare/1.2.1...1.2.2
 [1.2.1]: https://github.com/wp-pay-gateways/icepay/compare/1.2.0...1.2.1

diff --git a/composer.json b/composer.json
@@ -30,8 +30,8 @@
 		"php": ">=5.2.4",
 		"xrstf/composer-php52": "1.*",
 		"icepay/icepay": "~2.4.0",
-		"wp-pay/core": "dev-develop",
-		"wp-pay-gateways/common": "dev-develop"
+		"wp-pay/core": "^1.3.1",
+		"wp-pay-gateways/common": "^1.0.0"
 	},
 	"require-dev": {
 		"phpmd/phpmd": "^2.2.3",