From: lain <lain@soykaf.club>
Date: Thu, 17 Sep 2020 14:09:01 +0000 (+0000)
Subject: Merge branch 'develop' into 'nondiscoverable-user-metadata'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7c60789ba540b8346c1a642b49c29df213217655;p=akkoma

Merge branch 'develop' into 'nondiscoverable-user-metadata'

# Conflicts:
#   CHANGELOG.md
---

7c60789ba540b8346c1a642b49c29df213217655
diff --cc CHANGELOG.md
index a7a4f08ae,f7a372e11..6072d4cbe
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -9,7 -9,7 +9,8 @@@ The format is based on [Keep a Changelo
  
  - Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated.
  - Renamed `:timeout` in `pools` namespace to `:recv_timeout`, old name is deprecated.
 +- The `discoverable` field in the `User` struct will now add a NOINDEX metatag to profile pages when false.
+ - Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
  
  ### Removed