From 03ed9cefd048976c0e4cfd74de0489034ac81f93 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Aug 2017 09:33:16 +0200 Subject: switch --- composer.json | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 0a75880..939aea9 100644 --- a/composer.json +++ b/composer.json @@ -14,11 +14,12 @@ } ], "require": { - "php": ">=5.3.1", - "nette/utils": "~2.2" + "php": ">=5.6.0", + "nette/utils": "^2.4.2 || ~3.0.0" }, "require-dev": { - "nette/tester": "~1.4" + "nette/tester": "^2.0", + "tracy/tracy": "^2.3" }, "conflict": { "nette/nette": "<2.2" @@ -26,5 +27,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + } } -- cgit