Merge branch 'features/pleroma-tan-mastofe' into 'develop'
authorlambda <lain@soykaf.club>
Thu, 4 Apr 2019 07:34:20 +0000 (07:34 +0000)
committerlambda <lain@soykaf.club>
Thu, 4 Apr 2019 07:34:20 +0000 (07:34 +0000)
commitc900ff39afa97b5ea24145611f42e8085e343db1
treedf96750b386e39fd273280bfcc057257b1422d59
parent3f8be270c6682d14d60ba1071bf32d2ceffd6947
parentaf0065a71feb470bd69bec36999bc40a662e3e83
Merge branch 'features/pleroma-tan-mastofe' into 'develop'

mastodon_api_controller.ex: Add pleroma-tan to initial_state

See merge request pleroma/pleroma!1018