diff --git a/CHANGELOG.md b/CHANGELOG.md index 262f5480..edde1545 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,9 @@ All notable changes to this project are documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [1.2.0] - Unreleased +## [1.2.0] - 2016-10-03 ### Added -- Support for Symfony 3.0. Note that Symfony 3.0 introduces BC breaks. This means that you'll probably need to do more than simply updating to version `1.2.0` of this bundle for your code to keep working under Symfony 3.0. Please see Symfony's [Upgrade Guide](https://github.com/symfony/symfony/blob/master/UPGRADE-3.0.md) for information on what you need to change. +- Added support for Symfony 3.0. Note that Symfony 3.0 introduces BC breaks. This means that you'll probably need to do more than simply updating to version `1.2.0` of this bundle for your code to keep working under Symfony 3.0. Please see Symfony's [Upgrade Guide](https://github.com/symfony/symfony/blob/master/UPGRADE-3.0.md) for information on what you need to change. - [Docs] More clear and detailed setup instructions - [Docs] Much more detailed guide on how to accept payments diff --git a/README.md b/README.md index f39c5c58..e44b8fb4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Features: - Simple, unified API (integrate once and use any payment provider) - Persistence of financial entities (such as payments, transactions, etc.) - Transaction management including retry logic -- Encryption of sensitive d≤ata +- Encryption of sensitive data - Supports [many](http://jmspaymentcorebundle.readthedocs.io/en/latest/backends.html) payment backends out of the box - Easily support other payment backends diff --git a/composer.json b/composer.json index fca0e871..84d6842b 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,7 @@ "target-dir": "JMS/Payment/CoreBundle", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } } }