Merge branch 'issue/941' into 'develop'
authorlain <lain@soykaf.club>
Tue, 4 Jun 2019 14:58:13 +0000 (14:58 +0000)
committerlain <lain@soykaf.club>
Tue, 4 Jun 2019 14:58:13 +0000 (14:58 +0000)
commitf178a6f3f0d152a5e75c82da08195ee2d7fd3612
tree3adf7ccf852cf4f4f12804a5f4427583905e17b7
parent0eb7464c10df109e8aacf734bb092f69192ab5c2
parent1e7bb69a957c279eb75ed72cca779caa9d8f25ce
Merge branch 'issue/941' into 'develop'

[#941] add option skip_thread_containment

See merge request pleroma/pleroma!1237