aboutsummaryrefslogtreecommitdiff
path: root/docs/config.md
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-09-23 21:32:50 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-09-23 21:32:50 +0300
commit38245f13367cdc2df29ff2a499418e526b654fb5 (patch)
tree514724023f061f56e42fcaa7ae79f07d3d055c58 /docs/config.md
parentd4ed3a35b8aa34cd968113970bbab445eb251703 (diff)
parentfd48bd80eb7eab563c25586b1deba2ed42c02c5a (diff)
downloadpleroma-38245f13367cdc2df29ff2a499418e526b654fb5.tar.gz
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
Diffstat (limited to 'docs/config.md')
-rw-r--r--docs/config.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md
index 3f37fa561..1179def56 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -707,6 +707,8 @@ Configure OAuth 2 provider capabilities:
* `pack_extensions`: A list of file extensions for emojis, when no emoji.txt for a pack is present. Example `[".png", ".gif"]`
* `groups`: Emojis are ordered in groups (tags). This is an array of key-value pairs where the key is the groupname and the value the location or array of locations. `*` can be used as a wildcard. Example `[Custom: ["/emoji/*.png", "/emoji/custom/*.png"]]`
* `default_manifest`: Location of the JSON-manifest. This manifest contains information about the emoji-packs you can download. Currently only one manifest can be added (no arrays).
+* `shared_pack_cache_seconds_per_file`: When an emoji pack is shared, the archive is created and cached in
+ memory for this amount of seconds multiplied by the number of files.
## Database options