Merge branch 'issue/1218' into 'develop'
authorlain <lain@soykaf.club>
Wed, 25 Sep 2019 10:26:41 +0000 (10:26 +0000)
committerlain <lain@soykaf.club>
Wed, 25 Sep 2019 10:26:41 +0000 (10:26 +0000)
commita150664a0a4becab59428b917b3e120e424d3c63
tree9acff5da3ff7a09f5b6f1e33ee9ac225471b4da6
parent29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965
parent1a858134edabfe9a85e07fb801b9ed41649ba08a
Merge branch 'issue/1218' into 'develop'

[#1218] Issue/1218

See merge request pleroma/pleroma!1609