Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 2 Oct 2019 14:17:21 +0000 (14:17 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 2 Oct 2019 14:17:21 +0000 (14:17 +0000)
commitc5e937b156ea1f8f96ade7d9104fc2c5fd1dd9cd
treedd5813a132b48071819ed9b987d9f0281cab0160
parent433f2c0f6854d2838819e08f0fb0a9e8cf058021
parent9b68aab8b3cf576f91566cd659e4e5719dccb15a
Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop'

[#1278] Move actions from MastodonAPIController to CustomEmojiController and MastoFEController

See merge request pleroma/pleroma!1772