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)
commit8ca993c789fb3d41450419fc49bfa22542368ba8
tree4c387e350e638be03fe9c387858bb1fd825082fc
parent1ac0969c7226c40d5d674d63996f1164a86ecb9a
parent010d77ec855245def7fa785357db6e43cf1f14c7
Merge branch 'revert-1ac0969c' into 'develop'

Revert "Merge branch 'mrf-silence-2' into 'develop'"

See merge request pleroma/pleroma!2825