projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Fix merge conflicts with upstream
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
twitter_api
/
remote_follow
/
follow_mfa.html.eex
2021-06-04
Sean King
Fix merge conflicts with upstream
blob
|
commitdiff
|
raw
2021-06-04
Haelwenn
Merge branch 'tests/openapi-everywhere' into 'develop'
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Haelwenn
Merge branch 'features/validators-note' into 'develop'
blob
|
commitdiff
|
raw
2021-05-31
Haelwenn
Merge branch 'docs/goto-libera' into 'develop'
blob
|
commitdiff
|
raw
2021-05-30
Alex Gleason
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f...
blob
|
commitdiff
|
raw
2021-05-30
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-28
feld
Merge branch 'cycles-router-api-routes' into 'develop'
blob
|
commitdiff
|
raw
2021-05-28
feld
Merge branch 'simplepolicy-announce-leak' into 'develop'
blob
|
commitdiff
|
raw
2021-05-28
feld
Merge branch 'gitignore-runtime-exs' into 'develop'
blob
|
commitdiff
|
raw
2021-05-28
feld
Merge branch 'alias-router-helpers' into 'develop'
blob
|
commitdiff
|
raw
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-18
Alex Gleason
Switch to aliasing `Router.Helpers` instead of importing
blob
|
commitdiff
|
raw
2020-08-28
lain
Merge branch 'release/2.1.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-25
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-20
lain
Merge branch 'bugfix/mix.exs-version-dot-git-less'...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-16
lain
Merge branch 'develop' into 'remove-twitter-api'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-10
lain
Merge branch 'shortening-modules-name' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
lain
Merge branch 'fix/privacy-notification' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276-2
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
Haelwenn
Merge branch 'feature/restrict-c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'openapi/polls' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'streamer-worker-registry' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'issue/209' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
Maksim
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationControlle...
blob
|
commitdiff
|
raw
|
diff to current
projects / akkoma / history