Merge remote-tracking branch 'upstream/pull/2267'

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 988b55a633a24c608e6559981dc58d11472b5f94..a664b78b0f883fe4cf15d23f14ae26688f22be5b 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -57,6 +57,8 @@ nearby_users: 30
 nearby_radius: 50
 # Spam threshold
 spam_threshold: 50
 nearby_radius: 50
 # Spam threshold
 spam_threshold: 50

+# Delay diary entries from appearing in the feed for this many hours
+diary_feed_delay: 0

 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB
 # Use the built-in jobs queue for importing traces
 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB
 # Use the built-in jobs queue for importing traces