summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-06-15 16:03:40 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-06-15 16:03:40 +0400
commit58e4e3db8b04933129303d0ad9da74b43cbb4003 (patch)
tree28cc28e116b8a8091e686ebc7a17f3c783d7ad04 /docs
parent09d31d24de568aac06fe203beeb8bb2a9de8f602 (diff)
parent448e93ce2c1eab9eb91118b90f661c31056e4781 (diff)
downloadpleroma-58e4e3db8b04933129303d0ad9da74b43cbb4003.tar.gz
pleroma-58e4e3db8b04933129303d0ad9da74b43cbb4003.zip
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration/cheatsheet.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 456762151..fad67fc4d 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -138,8 +138,9 @@ their ActivityPub ID.
An example:
```elixir
-config :pleroma, :mrf_user_allowlist,
- "example.org": ["https://example.org/users/admin"]
+config :pleroma, :mrf_user_allowlist, %{
+ "example.org" => ["https://example.org/users/admin"]
+}
```
#### :mrf_object_age