diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 11:43:49 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 11:43:49 +0300 |
| commit | 06b3bb54c5567fe82ad2a015673fffba667997ee (patch) | |
| tree | 84bde8abcef86ef398eef0afdc9ae77e5f464bf1 /rel | |
| parent | 64095961fe490029886cae358683532ea65bf2c0 (diff) | |
| parent | 9e34919dcdbeedf8eb623dc86b05f63ef44d8859 (diff) | |
| download | pleroma-06b3bb54c5567fe82ad2a015673fffba667997ee.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions