summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-08-06 10:09:53 +0200
committerRemi Collet <remi@remirepo.net>2017-08-06 10:09:53 +0200
commitf1d57010229b925d7a838804d3834568eea2c877 (patch)
tree7c25a1788bec40b276a0a6f666b3d8d934416019 /composer.json
parent6e33cd819a2d70337840965d3b6e22fd97060ad9 (diff)
clean
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json14
1 files changed, 10 insertions, 4 deletions
diff --git a/composer.json b/composer.json
index 1b6763d..77d713e 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"
},
"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"
+ }
+ }
}