Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_pack_controller.ex
2020-07-09 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-06-30 Mark FelderMerge branch 'develop' into activation-meta
2020-06-29 Egor KislitsynMerge branch 'develop' into remove-twitter-api
2020-06-25 feldMerge branch 'preload-data' into 'develop'
2020-06-23 Roman ChvanikovMerge develop
2020-06-23 HaelwennMerge branch 'feature/1631-redesign-mrf-configuration...
2020-06-23 lainMerge branch 'issue/1798' into 'develop'
2020-06-23 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-22 HaelwennMerge branch 'warning/mastofe-settings-blob' into ...
2020-06-22 lainMerge branch 'feature/1739-account-endpoints' into...
2020-06-22 lainMerge branch 'fix/1825-admin-api-error-codes' into...
2020-06-22 rinpatchMerge branch '1865-media-only' into 'develop'
2020-06-22 rinpatchMerge branch '1883-mrf-chat' into 'develop'
2020-06-22 lainMerge branch 'feature/1854-emoji-pagination' into ...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-19 Alexander Strizhakovadding overall count for packs and files
2020-06-18 Alexander Strizhakovemoji pagination for pack show action
2020-06-18 Alexander Strizhakovemoji packs pagination
2020-06-08 Roman Chvanikovmerge develop
2020-06-06 sadposterMerge branch 'develop' of https://git.pleroma.social...
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-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 lainMerge branch 'develop' of git.pleroma.social:pleroma...
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-21 lainMerge branch 'develop' of git.pleroma.social:pleroma...
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