Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jelle-S committed Nov 29, 2017
2 parents 43c686c + 59baff5 commit f9c8edf
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ script:
- vendor/bin/robo test:coverage-codeclimate
after_script:
- if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"require": {
"consolidation/robo": "~1.0",
"php": ">=5.5.0",
"phpseclib/phpseclib": ">=2.0.6 <2.0.8",
"phpseclib/phpseclib": "^2.0.9",
"backup-manager/backup-manager": "^1.1"
},
"require-dev": {
Expand Down

0 comments on commit f9c8edf

Please sign in to comment.