Fix merge conflicts with upstream
[akkoma] / lib / pleroma / web / templates / twitter_api / remote_follow / follow_mfa.html.eex
2021-06-04 Sean KingFix merge conflicts with upstream
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop'
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop'
2021-05-31 HaelwennMerge branch 'docs/goto-libera' into 'develop'
2021-05-30 Alex GleasonMerge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f...
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 feldMerge branch 'cycles-router-api-routes' into 'develop'
2021-05-28 feldMerge branch 'simplepolicy-announce-leak' into 'develop'
2021-05-28 feldMerge branch 'gitignore-runtime-exs' into 'develop'
2021-05-28 feldMerge branch 'alias-router-helpers' into 'develop'
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-18 Alex GleasonSwitch to aliasing `Router.Helpers` instead of importing
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-16 lainMerge branch 'develop' into 'remove-twitter-api'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-05-10 lainMerge branch 'shortening-modules-name' into 'develop'
2020-05-08 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-08 lainMerge branch 'fix/privacy-notification' into 'develop'
2020-05-08 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-05-07 HaelwennMerge branch 'feature/restrict-c2s' into 'develop'
2020-05-07 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-07 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-07 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-07 lainMerge branch 'openapi/polls' into 'develop'
2020-05-07 lainMerge branch 'streamer-worker-registry' into 'develop'
2020-05-07 lainMerge branch 'issue/209' into 'develop'
2020-05-07 MaksimPleroma.Web.TwitterAPI.TwoFactorAuthenticationControlle...