Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
authorlain <lain@soykaf.club>
Fri, 17 May 2019 10:26:59 +0000 (12:26 +0200)
committerlain <lain@soykaf.club>
Fri, 17 May 2019 10:26:59 +0000 (12:26 +0200)
commit412a3d8a0f74ee3a46f9ba98d906c65c6c1c4da8
treed7dc5c61e4b3a01b21e33ccbea3aa4bfffc051aa
parentf1e67bdc312ba16a37916024244d6cb9d4417c9e
parente5b34f5e0544371603bc2b570c26ede3182c2f8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
config/config.exs
docs/config.md
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex