diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b5b2f1..0984fe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Versions prior to 1.0 were originally released as `phly/conduit`; please visit its [CHANGELOG](https://github.com/phly/conduit/blob/master/CHANGELOG.md) for details. -## 3.0.0 - TBD +## 3.0.0 - 2018-03-15 ### Added diff --git a/composer.json b/composer.json index 864d644..9f3a44e 100644 --- a/composer.json +++ b/composer.json @@ -58,9 +58,8 @@ }, "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev", - "dev-release-3.0.0": "3.0.x-dev" + "dev-master": "3.0.x-dev", + "dev-develop": "3.1.x-dev" } }, "scripts": { diff --git a/composer.lock b/composer.lock index c638617..f316ba2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "b362b0bdd137d981039645e99c637403", + "content-hash": "feb250e0610cf49d6034108d63e7426d", "packages": [ { "name": "fig/http-message-util",