diff options
author | lain <lain@soykaf.club> | 2024-08-02 10:45:44 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2024-08-02 10:45:44 +0000 |
commit | 8f1866e3ade52a7d4bacf46b4c06bf9468eb1fef (patch) | |
tree | 5f8824d56f10d1c94353afeb77833cd250e67369 /changelog.d/ffmpeg-limiter.add | |
parent | f2dc706f6f8913e21d2a21e5c6ca4e411afc559a (diff) | |
parent | 36d469cf022ea66947a73ee4c762d7f459aceee4 (diff) | |
download | pleroma-8f1866e3ade52a7d4bacf46b4c06bf9468eb1fef.tar.gz pleroma-8f1866e3ade52a7d4bacf46b4c06bf9468eb1fef.zip |
Merge branch 'stable' into 'develop'
Stable
See merge request pleroma/pleroma!4201
Diffstat (limited to 'changelog.d/ffmpeg-limiter.add')
-rw-r--r-- | changelog.d/ffmpeg-limiter.add | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/ffmpeg-limiter.add b/changelog.d/ffmpeg-limiter.add deleted file mode 100644 index e4a5ef196..000000000 --- a/changelog.d/ffmpeg-limiter.add +++ /dev/null @@ -1 +0,0 @@ -Framegrabs with ffmpeg will execute with a 5 second timeout and cache the URLs of failures with a TTL of 15 minutes to prevent excessive retries. |