From e48b4d44d49f820e1b85ff16b9402e01c770c83a Mon Sep 17 00:00:00 2001 From: Adam Engebretson Date: Tue, 22 Dec 2015 23:43:33 -0800 Subject: [PATCH] Updating for 5.2 Signed-off-by: Adam Engebretson --- .gitignore | 1 + composer.json | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4c735c9..27b975a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ composer.phar composer.lock .DS_Store Thumbs.db +.idea diff --git a/composer.json b/composer.json index 608e831..2a58f57 100644 --- a/composer.json +++ b/composer.json @@ -28,11 +28,5 @@ "psr-4": { "Collective\\Bus\\": "src/" } - }, - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "minimum-stability": "dev" + } }