Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / mastodon_api / controllers / custom_emoji_controller.ex
2020-04-27 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-04-22 lainMerge branch 'fix/1689-fix-migrate-to-db' into 'develop'
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-21 lainMerge branch 'openapi/custom-emojis' into 'develop'
2020-04-13 Egor KislitsynAdd OpenAPI spec for CustomEmojiController
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-13 rinpatchMerge branch 'feature/mastofe-admin-scope' into 'develop'
2020-03-13 rinpatchMerge branch 'docs/direct_conversation_id' into 'develop'
2020-03-13 rinpatchMerge branch 'static-accept-missing' into 'develop'
2020-03-11 feldMerge branch 'fix/signup-without-email' into 'develop'
2020-03-11 feldMerge branch 'relay-list-change' into 'develop'
2020-03-09 lainMerge branch 'patch-1' into 'develop'
2020-03-08 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-03-08 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-07 rinpatchMerge branch 'restart-fix-for-mix-tasks' into 'develop'
2020-03-06 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 feldMerge branch 'exclude-reblogs-from-admin-api-by-default...
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
2020-03-03 Mark FelderMerge branch 'develop' into gun
2020-03-03 HaelwennMerge branch 'chore/update-copyrights' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2019-10-19 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-07 lainMerge branch 'misskey-compat' into 'reactions'
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 HaelwennMerge branch 'fix-prameter-name-of-accounts-update...
2019-10-05 kaniiniMerge branch 'accept-embedded-announce-object' into...
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-04 lainMerge branch 'featrue/job-monitor' into 'develop'
2019-10-04 lainMerge branch 'bugfix/notification-nil-actor' into ...
2019-10-04 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-10-02 rinpatchMerge branch 'split-masto-api/masto_fe_and_custom_emoji...
2019-10-02 Egor KislitsynAdd CustomEmojiController