diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-03-20 08:53:08 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-03-20 08:53:08 +0100 |
| commit | b10c519cc16ac7cc115becd19bc8eeb3ee2e4c38 (patch) | |
| tree | 303a49bd4e386ea8895e07c31f826b15f711ae27 /composer.json | |
| parent | 2f3f95d3a9473d4b9c15727c960f51026c992094 (diff) | |
| parent | 1bdab6e633fd023432ed86ad898da1fe4ddc470f (diff) | |
| download | volse-hubzilla-b10c519cc16ac7cc115becd19bc8eeb3ee2e4c38.tar.gz volse-hubzilla-b10c519cc16ac7cc115becd19bc8eeb3ee2e4c38.tar.bz2 volse-hubzilla-b10c519cc16ac7cc115becd19bc8eeb3ee2e4c38.zip | |
Merge branch 'dev' into bs4
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 868a89d19..c99709c77 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,8 @@ "ext-openssl" : "*", "sabre/dav" : "~3.2", "michelf/php-markdown" : "^1.7", - "pixel418/markdownify": "^2.2" + "pixel418/markdownify": "^2.2", + "bshaffer/oauth2-server-php": "^1.9" }, "require-dev" : { "php" : ">=7.0", |