Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'

# Conflicts: # config/description.exs
2020-02-13 14:37:55 +00:00 · 2020-02-13 14:37:55 +00:00 · b312c36b8e
commit b312c36b8e
parent 571a475c7e 0db88f547b
3 changed files with 46 additions and 20 deletions
--- a/lib/pleroma/activity_expiration.ex
+++ b/lib/pleroma/activity_expiration.ex
@ -62,6 +62,6 @@ defmodule Pleroma.ActivityExpiration do
  def expires_late_enough?(scheduled_at) do
    now = NaiveDateTime.utc_now()
    diff = NaiveDateTime.diff(scheduled_at, now, :millisecond)
-    diff >= @min_activity_lifetime
+    diff > @min_activity_lifetime
  end
 end