Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication...
[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_api_controller.ex
2019-09-24 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-23 kaniiniMerge branch 'feature/force-password-reset' into 'develop'
2019-09-23 kaniiniMerge branch 'support-rel-ugc' into 'develop'
2019-09-23 kaniiniMerge branch 'remove-direct-messages-from-public-timeli...
2019-09-23 kaniiniMerge branch 'test/activity_pub/transmogrifier.ex'...
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 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