projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1a43f3 37b9e5e)
Merge branch 'mrf-silence-2' into 'develop'
authorlain <lain@soykaf.club>
Fri, 31 Jul 2020 14:43:33 +0000 (14:43 +0000)
committerlain <lain@soykaf.club>
Fri, 31 Jul 2020 14:43:33 +0000 (14:43 +0000)
MRF silencing alternative solution

See merge request pleroma/pleroma!2820

1  2 
config/description.exs patch | diff1 | diff2 | blob | history
docs/configuration/cheatsheet.md patch | diff1 | diff2 | blob | history

diff --cc config/description.exs
Simple merge
diff --cc docs/configuration/cheatsheet.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git