Merge remote-tracking branch 'origin/1.0' into 1.1

Conflicts: code/model/Widget.php
2015-05-04 11:46:37 +12:00 · 2015-05-04 11:46:37 +12:00 · ccea929cb9
parent 59e4ba50f2 25a1a35a0b
commit ccea929cb9
3 changed files with 4 additions and 7 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -6,14 +6,11 @@ php:

 env:
 - DB=MYSQL CORE_RELEASE=3.1
- - DB=PGSQL CORE_RELEASE=3.1

 matrix:
  include:
    - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=3
-    - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=master
+      env: DB=PGSQL CORE_RELEASE=3.1

 before_script:
 - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # Widgets Module

-[![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-widgets.png?branch=master)](http://travis-ci.org/silverstripe/silverstripe-widgets)
+[![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-widgets.png?branch=1.1)](http://travis-ci.org/silverstripe/silverstripe-widgets)

 ## Introduction

--- a/composer.json
+++ b/composer.json
@ -10,8 +10,8 @@
 		}
 	],
 	"require": {
-		"silverstripe/framework": ">=3.1",
-		"silverstripe/cms": ">=3.1"
+		"silverstripe/framework": "3.1.*",
+		"silverstripe/cms": "3.1.*"
 	},
 	"require-dev": {
 		"phpunit/PHPUnit": "~3.7@stable"