Merge branch 'issues/1016' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 26 Jun 2019 03:55:20 +0000 (03:55 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 26 Jun 2019 03:55:20 +0000 (03:55 +0000)
commite6f036b9adf91aa81afc676c13ccecf04359241c
tree99e4fe5fbdfad8bc2ff7682837d8e6001ca3f518
parentd80859731e50393851e6026ad301ed20d2b0db2a
parent437fd6046d6e6f19a5b9cd2e8178ec872a94af5d
Merge branch 'issues/1016' into 'develop'

[#1016] add clear formatted text/ removes links with private ip

See merge request pleroma/pleroma!1335