projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ab2dbb a4a3e3b)
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sun, 18 Aug 2019 21:57:55 +0000 (21:57 +0000)
committerkaniini <ariadne@dereferenced.org>
Sun, 18 Aug 2019 21:57:55 +0000 (21:57 +0000)
Hide muted theads from home/public timelines unless `with_muted` is set

See merge request pleroma/pleroma!1575

1  2 
lib/pleroma/web/activity_pub/activity_pub.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/streamer.ex patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/web/streamer.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git