diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-08-02 16:12:02 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-08-02 16:12:02 +0200 |
| commit | 9d6e7bbb9d584607f57c5d9ef13082f7997282e6 (patch) | |
| tree | 90e14596d6241729930b73b0f9bc5fc5eef74baf /composer-dev.json | |
| parent | 2d8df338573ee2184893ff9f46b2a8f15b19a4fe (diff) | |
php-nette-php-generator: 2.4.1
Diffstat (limited to 'composer-dev.json')
| -rw-r--r-- | composer-dev.json | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/composer-dev.json b/composer-dev.json index 0a75880..de69ad9 100644 --- a/composer-dev.json +++ b/composer-dev.json @@ -14,11 +14,12 @@ } ], "require": { - "php": ">=5.3.1", - "nette/utils": "~2.2" + "php": ">=5.6.0", + "nette/utils": "~2.4" }, "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.4-dev" + } + } } |