Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 7 Oct 2019 02:14:45 +0000 (02:14 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 7 Oct 2019 02:14:45 +0000 (02:14 +0000)
commitb4f3c16885a489c40de82e5ef321caafa4b10c81
treee81e3d7ba6882b31bd18c221f872049af73e44f2
parent25cffffaf1685ef02cd318bdbd99bb325d295458
parentb93856874de673f1c05c557ad482d4480ca7e0a7
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'

[#1234] Mastodon 2.4.3 hierarchical OAuth scopes

Closes #1234

See merge request pleroma/pleroma!1643
CHANGELOG.md