From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 1 Oct 2020 20:48:30 +0000 (-0300)
Subject: Merge remote-tracking branch 'querwurzelt/master' into merge
X-Git-Tag: v0.99.0
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b3bbae81b7b2c8132a4e43cfa49b81fae58dd8e5;p=semanticscuttle.git

Merge remote-tracking branch 'querwurzelt/master' into merge
---

b3bbae81b7b2c8132a4e43cfa49b81fae58dd8e5
diff --cc data/config.default.php
index 95df176,bb9eddb..73b098b
--- a/data/config.default.php
+++ b/data/config.default.php
@@@ -778,22 -778,10 +778,28 @@@ $unittestUrl = null
   */
  $allowUnittestMode = false;
  
 +/***************************************************
 + * Caching support
 + *
 + * Use the following configuration if you want to provide a link
 + * to a cached copy of your bookmarks.
 + *
 + * Please note that these feature just provide the link if a cached
 + * copy exists.
 + *
 + * You should download SemanticScuttle bookmarks using a tool like
 + * https://git.fluxo.info/?p=httruta.git
 + */
 +
 +/**
 + * Set to the base public URL of you cache folder.
 + */
 +$cacheUrl = null;
 +
+ /**
+  * bookmark-bot email address mapping
+  * Input address as key, user email as target
+  */
+ $botMailMap = array();
+ 
  ?>