From 9d6e7bbb9d584607f57c5d9ef13082f7997282e6 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 2 Aug 2016 16:12:02 +0200
Subject: php-nette-php-generator: 2.4.1

---
 composer-dev.json | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'composer-dev.json')

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"
+		}
+	}
 }
-- 
cgit