Merge branch 'stable' into release/2.0.0
[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_api_controller.ex
2019-09-23 rinpatchEmoji API Controller: Follow phoenix directory structure