projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8d4bd1 03a318a)
Merge branch 'feature/autofollowing' into 'develop'
authorfeld <feld@feld.me>
Tue, 27 Oct 2020 22:55:31 +0000 (22:55 +0000)
committerfeld <feld@feld.me>
Tue, 27 Oct 2020 22:55:31 +0000 (22:55 +0000)
autofollowing_nicknames

See merge request pleroma/pleroma!3087

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/user.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git