From f532f9fba2f50dececc17dddea6b2e94f0a59e36 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Aug 2016 09:44:59 +0200 Subject: php-nette-security: 2.4.0 --- composer-dev.json | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'composer-dev.json') diff --git a/composer-dev.json b/composer-dev.json index c95cdb1..cf2a1b6 100644 --- a/composer-dev.json +++ b/composer-dev.json @@ -14,13 +14,14 @@ } ], "require": { - "php": ">=5.3.1", - "nette/utils": "~2.2" + "php": ">=5.6.0", + "nette/utils": "~2.4" }, "require-dev": { "nette/di": "~2.3", "nette/http": "~2.3", - "nette/tester": "~1.4" + "nette/tester": "~2.0", + "tracy/tracy": "^2.3" }, "conflict": { "nette/nette": "<2.2" @@ -28,5 +29,10 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + } } -- cgit