Merge branch 'removing-fed-sockets-settings' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 26 Nov 2020 15:35:22 +0000 (15:35 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 26 Nov 2020 15:35:22 +0000 (15:35 +0000)
commitbb522bcc44463d258672f35979a2c939e7199e55
treeed0ba622a9167484011b3e335d4c688d4d13a23d
parent2b4e3555222792a54755e8c6be7d2e8d44b1c99d
parent94480c66078d664accc1dc3c2cdb029c327b545c
Merge branch 'removing-fed-sockets-settings' into 'develop'

Removing remaining fed sockets settings

See merge request pleroma/pleroma!3177