Merge branch 'develop' into openapi/admin/relay
[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_pack_controller.ex
2020-06-02 Egor KislitsynMerge branch 'develop' into openapi/admin/relay
2020-06-02 lainMerge branch 'openapi/admin/oauth-apps' into 'develop'
2020-06-02 lainMerge branch 'tagline' into 'develop'
2020-06-02 lainMerge branch 'openapi/admin/invites' into 'develop'
2020-06-02 lainMerge branch 'feature/status-by-id-account-view' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-29 rinpatchMerge branch 'media-docs' into 'develop'
2020-05-29 feldMerge branch 'mix/database-vacuum-options' into 'develop'
2020-05-29 lainMerge branch 'fix-relay-repeat-notification' into ...
2020-05-29 rinpatchMerge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
2020-05-28 lainMerge branch 'feature/1792-update-actor-type' into...
2020-05-28 rinpatchMerge branch 'chore/fix-spelling' into 'develop'
2020-05-27 Mark FelderFix minor spelling error
2020-05-22 HaelwennMerge branch 'announce-validator' into 'develop'
2020-05-22 HaelwennMerge branch '1113-op-mentioning' into 'develop'
2020-05-21 lainMerge branch 'features/emoji_stealer' into 'develop'
2020-05-21 lainMerge branch 'openapi/pleroma-api/pleroma' into 'develop'
2020-05-21 lainMerge branch 'issue/749' into 'develop'
2020-05-20 HaelwennMerge branch 'chore/update-config-fe' into 'develop'
2020-05-20 lainMerge branch 'openapi/pleroma-api/emojis' into 'develop'
2020-05-18 Egor KislitsynRename EmojiAPIController to EmojiPackController