Merge remote-tracking branch 'upstream/develop' into registration-workflow
[akkoma] / lib / pleroma / web / pleroma_api / controllers / conversation_controller.ex
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-13 feldMerge branch 'feature/1822-files-consistency' into...
2020-10-13 Alexander Strizhakovalias alphabetically order
2020-10-13 Alexander StrizhakovOAuthScopesPlug module name
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-07-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-06-30 Mark FelderMerge branch 'develop' into activation-meta
2020-06-29 Egor KislitsynMerge branch 'develop' into remove-twitter-api
2020-06-25 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-06-22 lainMerge branch 'feature/1739-account-endpoints' into...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-17 rinpatchMerge branch 'features/users-raw_bio' into 'develop'
2020-06-12 Mark FelderMerge branch 'develop' into preload-data
2020-06-08 Roman Chvanikovmerge develop
2020-06-08 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-06-08 lainMerge branch 'openapi/admin/relay' into 'develop'
2020-06-08 lainMerge branch 'feature/delete-follow-requests-on-user...
2020-06-08 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-08 lainMerge branch 'activity-pub-use-atoms-as-keys' into...
2020-06-05 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-04 Egor KislitsynUse atoms as keys in `ActivityPub.fetch_*` functions...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-25 lainMerge branch 'openapi/admin/status' into 'develop'
2020-05-22 HaelwennMerge branch 'announce-validator' into 'develop'
2020-05-22 HaelwennMerge branch '1113-op-mentioning' into 'develop'
2020-05-21 lainMerge branch 'issue/1707' into 'develop'
2020-05-21 lainMerge branch 'admin-logo-upload' into 'develop'
2020-05-21 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-21 lainMerge branch 'features/emoji_stealer' into 'develop'
2020-05-21 lainMerge branch 'openapi/pleroma-api/pleroma' into 'develop'
2020-05-20 Egor KislitsynMove conversation actions to PleromaAPI.ConversationCon...