From: rinpatch Date: Wed, 2 Oct 2019 14:17:21 +0000 (+0000) Subject: Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop' X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c5e937b156ea1f8f96ade7d9104fc2c5fd1dd9cd;p=akkoma 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 --- c5e937b156ea1f8f96ade7d9104fc2c5fd1dd9cd