summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json17
1 files changed, 12 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index a49ef8f..bb43bda 100644
--- a/composer.json
+++ b/composer.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"
+ }
+ }
}