projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66ebd88 cb1e389)
Merge branch 'follower-mrf-again' into 'develop'
authorlain <lain@soykaf.club>
Mon, 3 Aug 2020 14:22:11 +0000 (14:22 +0000)
committerlain <lain@soykaf.club>
Mon, 3 Aug 2020 14:22:11 +0000 (14:22 +0000)
Follower mrf again

See merge request pleroma/pleroma!2833

1  2 
config/config.exs patch | diff1 | diff2 | blob | history

diff --cc config/config.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git