From f1693d10d84a085e89dc52597db5dbfa33b1ef96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Monta=C3=B1ez?= Date: Sun, 8 Jan 2017 01:46:19 -0300 Subject: [PATCH] [Nostromo] Composer tweaks --- composer.json | 8 +++++++- composer.lock | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e0dfa41..ad32d89 100644 --- a/composer.json +++ b/composer.json @@ -33,5 +33,11 @@ "**/Tests/" ] }, - "bin": ["bin/mage"] + "bin": ["bin/mage"], + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev", + "dev-nostromo": "3.x-dev" + } + } } diff --git a/composer.lock b/composer.lock index 4fab24f..c827c9a 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": "9c173713ae84b1c0c845e53cf8f62d27", + "content-hash": "d9ca16d331cb81c45675d3905de30974", "packages": [ { "name": "monolog/monolog",