Merge branch 'master' into master

tiguchi · Feb 1, 2017 · 9a77f7d · 9a77f7d
2 parents 789e29d + 79d8966
commit 9a77f7d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -24,9 +24,9 @@
 		}
 	],
 	"require": {
-		"php": ">=5.5.0",
-		"laravel/framework": "5.2.*|5.3.*",
+ 		"laravel/framework": "5.2.*|5.3.*|5.4.*",
 		"guzzlehttp/guzzle": "~6.0"
+		"php": ">=5.6.4"
 	},
 	"autoload": {
 		"psr-4": {