Skip to content

Commit

Permalink
Merge pull request #19 from centraldesktop/feature/upgrade_php_option
Browse files Browse the repository at this point in the history
Bump version of PhpOption to add additional features
  • Loading branch information
treyhyde committed May 12, 2016
2 parents 806d0ed + d2d066c commit f71547a
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 33 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"require" : {
"php" : ">=5.5.0",
"ext-mbstring" : "*",
"phpoption/phpoption": "1.4.*",
"phpoption/phpoption": "1.5.*",
"symfony/console" : "2.*"
},
"require-dev": {
Expand Down
65 changes: 33 additions & 32 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f71547a

Please sign in to comment.