summaryrefslogtreecommitdiffstats
path: root/composer-dev.json
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-08-02 16:58:22 +0200
committerRemi Collet <fedora@famillecollet.com>2016-08-02 16:58:22 +0200
commit220024efcd08e0907a0d1d7a186d1cc89cdab53d (patch)
treec9e06fb656f2ff0237d1d6b2617850bab49f9f08 /composer-dev.json
parentfd4d10784bf407b317dfda838b437cb4fc42a721 (diff)
php-nette-http: 2.4.0
Diffstat (limited to 'composer-dev.json')
-rw-r--r--composer-dev.json16
1 files changed, 11 insertions, 5 deletions
diff --git a/composer-dev.json b/composer-dev.json
index 8f4640b..2930964 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -14,12 +14,13 @@
}
],
"require": {
- "php": ">=5.3.1",
- "nette/utils": "~2.2, >=2.2.2"
+ "php": ">=5.6.0",
+ "nette/utils": "^2.4"
},
"require-dev": {
- "nette/di": "~2.3",
- "nette/tester": "~1.4"
+ "nette/di": "^2.3",
+ "nette/tester": "~2.0",
+ "tracy/tracy": "^2.3"
},
"conflict": {
"nette/nette": "<2.2"
@@ -30,5 +31,10 @@
"autoload": {
"classmap": ["src/"]
},
- "minimum-stability": "dev"
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ }
}