diff --git a/CHANGELOG.md b/CHANGELOG.md index ae67a78..9c2bd3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file, in reverse Releases prior to 1.2.0 did not have entries. -## 1.2.0 - TBD +## 1.2.0 - 2018-06-25 ### Added diff --git a/composer.json b/composer.json index ef924a9..2b55e1c 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.2.x-dev" } }, "scripts": { diff --git a/composer.lock b/composer.lock index 58aa362..4e5c36b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "294d03fbbb63ac1c655bea9e4f7358a0", + "content-hash": "c225d9018bb6044c0423897bd18d9d5c", "packages": [], "packages-dev": [ {