Merge branch 'develop' into 'frontend-admin-api'
authorminibikini <egor@kislitsyn.com>
Mon, 2 Nov 2020 10:43:45 +0000 (10:43 +0000)
committerminibikini <egor@kislitsyn.com>
Mon, 2 Nov 2020 10:43:45 +0000 (10:43 +0000)
commit6163fbf55328808d90bb1a84cf05ae986f941b31
treee9868964ff5ff13ef58ce124f47434e84b0296aa
parent75d131ba1860dc75486819ca93310292244ef92e
parent9fbe9ef77436d6a9a176d264ee830300a2a37889
Merge branch 'develop' into 'frontend-admin-api'

# Conflicts:
#   lib/pleroma/web/router.ex
CHANGELOG.md
config/config.exs
docs/API/admin_api.md
lib/pleroma/web/router.ex