Merge pull request #158 from tractorcow/pulls/0.5/compat

Fix composer and travis to framework 3.1
2014-08-27 09:23:21 +12:00 · 2014-08-27 09:23:21 +12:00 · 62f47628e3
parent 4203a707bc 71e3b9db2d
commit 62f47628e3
2 changed files with 3 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -2,7 +2,7 @@

 language: php 

-php: 
+php:
 - 5.4

 env:
--- a/composer.json
+++ b/composer.json
@ -11,7 +11,7 @@
 	],
 	"require":
 	{
-		"silverstripe/framework": "~3.1",
-		"silverstripe/cms": "~3.1"
+		"silverstripe/framework": "~3.1.0",
+		"silverstripe/cms": "~3.1.0"
 	}
 }