From: lambda <lain@soykaf.club>
Date: Thu, 4 Apr 2019 07:34:20 +0000 (+0000)
Subject: Merge branch 'features/pleroma-tan-mastofe' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c900ff39afa97b5ea24145611f42e8085e343db1;p=akkoma

Merge branch 'features/pleroma-tan-mastofe' into 'develop'

mastodon_api_controller.ex: Add pleroma-tan to initial_state

See merge request pleroma/pleroma!1018
---

c900ff39afa97b5ea24145611f42e8085e343db1