projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: caadde3 16a7ffb)
Merge branch 'upstream/mrf-followbot' into 'develop'
authorfeld <feld@feld.me>
Tue, 30 Mar 2021 16:59:34 +0000 (16:59 +0000)
committerfeld <feld@feld.me>
Tue, 30 Mar 2021 16:59:34 +0000 (16:59 +0000)
Upstream/mrf followbot

See merge request pleroma/pleroma!3060


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