Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
[akkoma] / lib / pleroma / web / pleroma_api / views / scrobble_view.ex
2020-09-22 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-09-21 lainMerge branch 'bugfix/federator-actor-error' into 'develop'
2020-09-18 Maksim PechnikovMerge branch 'develop' into issue/2099
2020-09-17 rinpatchMerge branch 'stable' into stable-sync/2.1.2
2020-09-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-09-17 lainMerge branch 'develop' into 'nondiscoverable-user-metadata'
2020-09-17 lainMerge branch 'chat-moderation' into 'develop'
2020-09-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-09-11 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-09-11 Alex GleasonMastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-06-29 Egor KislitsynMerge branch 'develop' into remove-twitter-api
2020-06-22 lainMerge branch 'feature/1739-account-endpoints' into...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-08 Roman Chvanikovmerge develop
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-21 lainMerge branch 'features/emoji_stealer' 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 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-20 lainMerge branch 'openapi/pleroma-api/emojis' into 'develop'
2020-05-20 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-20 lainMerge branch 'feature/1734-user-deletion' into 'develop'
2020-05-20 HaelwennMerge branch 'exposed-background-image' into 'develop'
2020-05-20 lainMerge branch 'issue/1509' into 'develop'
2020-05-20 HaelwennMerge branch 'openapi/pleroma-api/scrobble' into 'develop'
2020-05-19 Egor KislitsynMove Scrobble views to ScrobbleView