projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e7642b ba3bf16)
Merge branch 'cherry-pick-8a7ee9fe' into 'stable'
authorfeld <feld@feld.me>
Fri, 20 Nov 2020 21:40:23 +0000 (21:40 +0000)
committerfeld <feld@feld.me>
Fri, 20 Nov 2020 21:40:23 +0000 (21:40 +0000)
Merge branch 'revert-da4660d2' into 'stable'

See merge request pleroma/pleroma!3166


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git