projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ac0969 010d77e)
Merge branch 'revert-1ac0969c' into 'develop'
authorlain <lain@soykaf.club>
Fri, 31 Jul 2020 15:17:33 +0000 (15:17 +0000)
committerlain <lain@soykaf.club>
Fri, 31 Jul 2020 15:17:33 +0000 (15:17 +0000)
Revert "Merge branch 'mrf-silence-2' into 'develop'"

See merge request pleroma/pleroma!2825


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