Merge branch 'develop' into foxing-patch-2
[akkoma] / .mailmap
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-02-28 lainMerge branch 'feat/client_app_details' into 'develop'
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
2021-02-24 HaelwennMerge branch 'docfix/chat-token' into 'develop'
2021-02-20 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-02-17 rinpatchMerge branch '2510-oauth-app-tokens-further-support...
2021-02-16 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-16 rinpatchMerge branch '2053-notifications-actor-is-active-refact...
2021-02-15 rinpatchMerge branch 'chore/mailmap' into 'develop'
2021-02-15 rinpatchAdd myself to .mailmap
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-15 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-07-14 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-07-12 Roman Chvanikovmerge develop
2019-07-11 kaniiniMerge branch 'fix/1019-refactor' into 'develop'
2019-07-11 kaniiniMerge branch 'chore/mailmap' into 'develop'
2019-07-11 Ariadne Conilladd mailmap [ci skip]