From fed633723b0d137a0d0f14957f56ff4a2db2780d Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Nov 2017 11:16:31 -0600 Subject: [PATCH 1/2] Updates branch aliases - dev-master => 1.4-dev - dev-develop => 1.5-dev --- composer.json | 4 ++-- composer.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 04576ba..74cc966 100644 --- a/composer.json +++ b/composer.json @@ -44,8 +44,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.3-dev", - "dev-develop": "1.4-dev" + "dev-master": "1.4-dev", + "dev-develop": "1.5-dev" } }, "scripts": { diff --git a/composer.lock b/composer.lock index 23a55da..04a1679 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": "7f94817d869a6f78bbb081081c37a2be", + "content-hash": "16d2ffa462ec4ffd35bfab252b005025", "packages": [ { "name": "psr/container", From 670bdb6a5d1f9451d2a9158bc53050532f7b5719 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 27 Nov 2017 11:17:08 -0600 Subject: [PATCH 2/2] Prepares CHANGELOG for 1.4.0 release - Adds date for 1.4.0 release - Removes empty 1.3.1 stub --- CHANGELOG.md | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8d992a..e53a2e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 1.4.0 - TBD +## 1.4.0 - 2017-11-27 ### Added @@ -31,24 +31,6 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. -## 1.3.1 - TBD - -### Added - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - ## 1.3.0 - 2016-07-11 ### Added