diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-13 02:45:47 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-13 02:45:47 +0000 |
| commit | 984d7be1a4b4d1e1024a9f5d5aaee6252c553279 (patch) | |
| tree | 837a101fb853c673caec14bfee51aaca82331dd6 /config | |
| parent | b0fad153e1d4bf6c95c18bdab92a42978b729108 (diff) | |
| parent | f46cd7e9c750b9c4c36f0a6c4b3a1ffd2f94a6d0 (diff) | |
| download | pleroma-984d7be1a4b4d1e1024a9f5d5aaee6252c553279.tar.gz pleroma-984d7be1a4b4d1e1024a9f5d5aaee6252c553279.zip | |
Merge branch 'feature/remove-disable-blocks' into 'develop'
config: remove legacy activitypub accept_blocks setting
See merge request pleroma/pleroma!1556
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index d2325edbc..bf4970314 100644 --- a/config/config.exs +++ b/config/config.exs @@ -302,7 +302,6 @@ config :pleroma, :assets, default_mascot: :pleroma_fox_tan config :pleroma, :activitypub, - accept_blocks: true, unfollow_blocked: true, outgoing_blocks: true, follow_handshake_timeout: 500, |