Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_api_controller.ex
2019-09-23 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-23 Maksim PechnikovMerge branch 'develop' into test/activity_pub/transmogr...
2019-09-23 rinpatchMerge branch 'better-emoji-packs' into 'develop'
2019-09-23 rinpatchEmoji API Controller: Follow phoenix directory structure