Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sun, 3 Mar 2019 11:13:59 +0000 (11:13 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 3 Mar 2019 11:13:59 +0000 (11:13 +0000)
commit9b63fda9c70f0fd3030ada951f3514221ae2e3aa
tree9b05392395a23e768b6d7bab61968355549dd8eb
parentf38c316e6edbc88f1808a0c39488231ce17e4f35
parent9c6abec4d8b2487edeb124aa197a5dd6d771e345
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'

[#675] Do not show DMs in mentions timeline

See merge request pleroma/pleroma!877
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs