tonyair
/
silverstripe-testsession
mirror of https://github.com/silverstripe/silverstripe-testsession
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14 from tractorcow/pulls/3.1-api 

Fix branch to 3.1 compatibility
This commit is contained in:
Damian Mooyman 2014-07-21 10:29:34 +12:00
parent d91aae5945 3d774f7867
commit b98bbbe276
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -14,9 +14,9 @@ matrix:
- php: 5.3 - php: 5.3
env: DB=PGSQL CORE_RELEASE=3.1 env: DB=PGSQL CORE_RELEASE=3.1
- php: 5.4 - php: 5.4
env: DB=MYSQL CORE_RELEASE=master env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.5 - php: 5.5
env: DB=MYSQL CORE_RELEASE=master env: DB=MYSQL CORE_RELEASE=3.1
before_script: before_script:
- phpenv rehash - phpenv rehash

4
composer.json
View File

@ -14,7 +14,7 @@
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.3.2",
"composer/installers": "*", "composer/installers": "*",
"silverstripe/framework": "~3.1" "silverstripe/framework": ">=3.1,<3.2"
}, },
"minimum-stability": "dev" "minimum-stability": "dev"
} }