projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 433f2c0 9b68aab)
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)
[#1278] Move actions from MastodonAPIController to CustomEmojiController and MastoFEController

See merge request pleroma/pleroma!1772


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git