diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-08-02 16:19:23 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-08-02 16:19:23 +0200 |
| commit | a87fa1f50c811d0f9a58e80cc41eda8eb96818e4 (patch) | |
| tree | d60772d4bd3d6fa4c19bba8eb4c5530cb05ff1f2 /composer-dev.json | |
| parent | 4b45e7421ed81d9de97f4211d87cea8b22276b05 (diff) | |
php-nette-component-model: 2.3.0
Diffstat (limited to 'composer-dev.json')
| -rw-r--r-- | composer-dev.json | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/composer-dev.json b/composer-dev.json index a49ef8f..bb43bda 100644 --- a/composer-dev.json +++ b/composer-dev.json @@ -14,17 +14,24 @@ } ], "require": { - "php": ">=5.3.1", - "nette/utils": "^2.3.5" + "php": ">=5.6.0", + "nette/utils": "^2.4" }, "require-dev": { - "nette/tester": "~1.3" + "nette/tester": "~2.0", + "tracy/tracy": "^2.3" }, "conflict": { - "nette/nette": "<2.2" + "nette/nette": "<2.2", + "nette/application": "<2.4" }, "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + } } |