Merge branch 'block-behavior' into 'develop'
authorlain <lain@soykaf.club>
Mon, 15 Nov 2021 14:27:59 +0000 (14:27 +0000)
committerlain <lain@soykaf.club>
Mon, 15 Nov 2021 14:27:59 +0000 (14:27 +0000)
commite2772d6bf1317616ef5a27396101bf44f123ee7e
treef6b409a3a096fa0fbf7bde70413b6dd7cf3f0725
parent6e3df116935a549a92b74bfc2be9a4197ad7a995
parent762be6ce10d2145e8e31d42c5d1a0bab93dbe7b0
Merge branch 'block-behavior' into 'develop'

Configurable block visibility, fixes #2123

Closes #2123

See merge request pleroma/pleroma!3242
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/notification.ex
lib/pleroma/web/activity_pub/activity_pub.ex
test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs