diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:32:50 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:32:50 +0300 |
| commit | 38245f13367cdc2df29ff2a499418e526b654fb5 (patch) | |
| tree | 514724023f061f56e42fcaa7ae79f07d3d055c58 /config/description.exs | |
| parent | d4ed3a35b8aa34cd968113970bbab445eb251703 (diff) | |
| parent | fd48bd80eb7eab563c25586b1deba2ed42c02c5a (diff) | |
| download | pleroma-38245f13367cdc2df29ff2a499418e526b654fb5.tar.gz pleroma-38245f13367cdc2df29ff2a499418e526b654fb5.zip | |
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs index 65ea6bf01..5dc8dc364 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2256,6 +2256,14 @@ config :pleroma, :config_description, [ "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)", suggestions: ["https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json"] + }, + %{ + key: :shared_pack_cache_seconds_per_file, + type: :integer, + descpiption: + "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.", + suggestions: [60] } ] }, |