Merge branch 'revert-2b5d9eb1' into 'develop'
authorlain <lain@soykaf.club>
Tue, 21 Jul 2020 22:18:02 +0000 (22:18 +0000)
committerlain <lain@soykaf.club>
Tue, 21 Jul 2020 22:18:02 +0000 (22:18 +0000)
commitc36113cdf5865cbccbd1da2f7404454134139e43
tree99d52ee68fdaef14d5fc3e63ec90e6f241ea56c5
parent2b5d9eb10529325aef1b4aab980bd901ba6b0c70
parent696c13ce54aff25737f8f753a94747d79b9c54b0
Merge branch 'revert-2b5d9eb1' into 'develop'

Revert "Merge branch 'linkify' into 'develop'"

See merge request pleroma/pleroma!2784