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

Fix composer and travis to framework 3.1
silverstripe · Aug 26, 2014 · 62f4762 · 62f4762
2 parents 4203a70 + 71e3b9d
commit 62f4762
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@
 
 language: php 
 
-php: 
+php:
  - 5.4
 
 env:

diff --git 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"
 	}
 }