Skip to content

Commit

Permalink
Merge pull request #65 from olimorris/patch-1
Browse files Browse the repository at this point in the history
Update composer.json to work with Laravel 5.1

closes #66
  • Loading branch information
Mulkave committed Jun 15, 2015
2 parents e6914e2 + 0d6a480 commit 77bb9df
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
@@ -1,7 +1,6 @@
language: php

php:
- 5.4
- 5.5
- 5.6
- 7.0
Expand All @@ -10,8 +9,6 @@ php:
matrix:
allow_failures:
- php: 7.0
include:
- php: 5.4

before_script:
- travis_retry composer self-update
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Expand Up @@ -10,12 +10,12 @@
}
],
"require": {
"php": ">=5.4.0",
"illuminate/support": "5.0.*",
"illuminate/config": "5.0.*",
"symfony/finder": "2.6.*",
"symfony/console": "2.6.*",
"guzzlehttp/guzzle": "5.3.*",
"php": ">=5.5.0",
"illuminate/support": "~5.0",
"illuminate/config": "~5.0",
"symfony/finder": "2.7.*",
"symfony/console": "2.7.*",
"guzzlehttp/guzzle": "~5.3",
"aws/aws-sdk-php": "2.8.*"
},
"require-dev": {
Expand Down

0 comments on commit 77bb9df

Please sign in to comment.