From 0bf7212b6eb1db78bf6bb5b5f35196837cc596e5 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Fri, 11 Jul 2014 09:49:04 +1200 Subject: [PATCH] Alias master as 1.0 --- composer.json | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 6924271..6543514 100644 --- a/composer.json +++ b/composer.json @@ -4,18 +4,21 @@ "type": "silverstripe-module", "keywords": ["silverstripe", "mssql", "database"], "authors": [ - { - "name": "Sam Minnee", - "email": "sam@silverstripe.com" - }, - { - "name": "Sean Harvey", - "email": "sean@silverstripe.com" - } + { + "name": "Sam Minnee", + "email": "sam@silverstripe.com" + }, + { + "name": "Sean Harvey", + "email": "sean@silverstripe.com" + } ], - - "require": - { + "require": { "silverstripe/framework": "~3.2" + }, + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } } }