diff options
author | Remi Collet <remi@remirepo.net> | 2017-08-06 09:33:16 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2017-08-06 09:33:16 +0200 |
commit | 03ed9cefd048976c0e4cfd74de0489034ac81f93 (patch) | |
tree | 955e1294754dcba3d372b01c74031bbb5748ac1c /composer.json | |
parent | 3d1d7485cdc0cd525b6c6ea91f24f5b14afa72f5 (diff) |
switch
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 14 |
1 files changed, 10 insertions, 4 deletions
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" + } + } } |