Merge branch 'develop' into frontend-admin-api
authorEgor Kislitsyn <egor@kislitsyn.com>
Wed, 11 Nov 2020 15:53:40 +0000 (19:53 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Wed, 11 Nov 2020 15:53:40 +0000 (19:53 +0400)
commit08cbd655d14c74ced77e7af2c0acecf554e0ed91
tree4ffb3f3fa62e046e299df0378a56fb52a5b042cb
parente46c95b826c3fb98efa15cf6fd5d6cf2fb9797af
parent3cd7ea693fa820c04257b893725100eccf1cc96c
Merge branch 'develop' into frontend-admin-api
CHANGELOG.md
config/config.exs
lib/pleroma/web/router.ex