From: Mike Verdone <spiral@arcseconds.net>
Date: Wed, 24 Jul 2019 15:07:51 +0000 (+0200)
Subject: fixup! Update changelog
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=877575d0da830724e822eac2de243391aaea7ec8;p=akkoma

fixup! Update changelog
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75d236af5..f64506637 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Added
 - Expiring/ephemeral activites. All activities can have expires_on value set, which controls when they should be deleted automatically.
-- Mastodon API: in post_status, expires_at datetime parameter lets you set when an activity should expire
-- Mastodon API: all status JSON responses contain a `pleroma.expires_in` item which states the number of minutes until an activity expires. The value is only shown to the user who created the activity. To everyone else it's empty.
+- Mastodon API: in post_status, the expires_in parameter lets you set the number of minutes until an activity expires. It must be at least one hour.
+- Mastodon API: all status JSON responses contain a `pleroma.expires_on` item which states when an activity will expire. The value is only shown to the user who created the activity. To everyone else it's empty.
 - Configuration: `ActivityExpiration.enabled` controls whether expired activites will get deleted at the appropriate time. Enabled by default.
 
 ### Changed