Merge branch 'emoji-pack-json-pretty' into 'develop'
[akkoma] / lib / pleroma / web / pleroma_api / controllers /
2019-09-23 kaniiniMerge branch 'emoji-pack-json-pretty' into 'develop'
2019-09-23 Ekaterina VaartisAlso pretty print pack.json
2019-09-23 rinpatchMerge branch 'update-adminfe/2019-09-23' into 'develop'
2019-09-23 rinpatchMerge branch 'better-emoji-packs' into 'develop'
2019-09-23 rinpatchEmoji API Controller: Follow phoenix directory structure