diff options
author | zotlabs <mike@macgirvin.com> | 2017-03-19 17:13:26 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-03-19 17:13:26 -0700 |
commit | f746418fda3f29f4635a26c744990911e8fb6309 (patch) | |
tree | ec4f7bba45ca205c2edbd7ca730c4179ac20b083 /composer.json | |
parent | be10bf2cebd5d3ee449901cbf6814bf9a284bd10 (diff) | |
parent | 1bdab6e633fd023432ed86ad898da1fe4ddc470f (diff) | |
download | volse-hubzilla-f746418fda3f29f4635a26c744990911e8fb6309.tar.gz volse-hubzilla-f746418fda3f29f4635a26c744990911e8fb6309.tar.bz2 volse-hubzilla-f746418fda3f29f4635a26c744990911e8fb6309.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 4e54720ff..c99709c77 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "sabre/dav" : "~3.2", "michelf/php-markdown" : "^1.7", "pixel418/markdownify": "^2.2", - "bshaffer/oauth2-server-php": "~1.8" + "bshaffer/oauth2-server-php": "^1.9" }, "require-dev" : { "php" : ">=7.0", |