From 4c9873966c21b3c7fce35e4e619240e2ff2a1e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Proch=C3=A1zka?= <filip@prochazka.su>
Date: Sun, 10 May 2015 07:25:06 +0200
Subject: [PATCH] Require Nette 2.3

---
 .travis.yml   | 6 +++---
 composer.json | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 376dd27..0a0b611 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,19 @@
 language: php
 
 env:
-  - NETTE=nette-2.3-dev
+  - NETTE=default
   - NETTE=nette-2.3
-  - NETTE=nette-2.2
 
 php:
-  - 5.3.3
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 matrix:
   allow_failures:
+    - php: 7.0
     - php: hhvm
 
 before_install:
diff --git a/composer.json b/composer.json
index 90bd1e4..0ef3dc9 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
 		}
 	],
 	"require": {
-		"nette/di": "~2.2@dev",
-		"tracy/tracy": "~2.2@dev",
+		"nette/di": "~2.3@dev",
+		"tracy/tracy": "~2.3@dev",
 
 		"monolog/monolog": "~1.9"
 	},
@@ -62,7 +62,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "1.0-dev"
+			"dev-master": "1.1-dev"
 		}
 	}
 }