diff options
| author | Remi Collet <remi@remirepo.net> | 2017-08-06 09:47:38 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-08-06 09:47:38 +0200 |
| commit | 516ea9e4e9c57a18445fd86b2e54bb49a56299e2 (patch) | |
| tree | 11519cd75f612bd057c125bfe7dc717b0ff040f8 /composer.json | |
| parent | b1dcbe5ab86f29f31d246a1d1d48cac2d59761d1 (diff) | |
switch
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/composer.json b/composer.json index c95cdb1..20cc5c0 100644 --- a/composer.json +++ b/composer.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/di": "~2.4", + "nette/http": "~2.4", + "nette/tester": "~2.0", + "tracy/tracy": "^2.4" }, "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" + } + } } |