Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
TomK committed Feb 16, 2016
2 parents 4b86049 + 7303af8 commit cbb46e6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"homepage": "http://fortifi.co",
"license": "BSD-3-Clause",
"require": {
"fortifi/fortifi-api": "~3",
"fortifi/fortifi-api": "~4",
"league/oauth2-client": "~0.11",
"packaged/helpers": "~1.0"
},
"require-dev": {
"fortifi/fortifi-api": "dev-develop as 3.1",
"fortifi/fortifi-api": "dev-develop as 4.1",
"phpunit/phpunit": "~4.6"
},
"autoload": {
Expand Down

0 comments on commit cbb46e6

Please sign in to comment.