diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 17:12:17 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 17:12:17 +0300 |
| commit | b93856874de673f1c05c557ad482d4480ca7e0a7 (patch) | |
| tree | 53ad43d5626ef8019e2372fc07e3260ab4b25d82 /docs/API | |
| parent | 06b3bb54c5567fe82ad2a015673fffba667997ee (diff) | |
| download | pleroma-b93856874de673f1c05c557ad482d4480ca7e0a7.tar.gz | |
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
Diffstat (limited to 'docs/API')
0 files changed, 0 insertions, 0 deletions