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

diff --cc data/config.default.php
index 95df176f0ada85388644bf0447b56b2975eb687f,bb9eddb73ccad2351408e071c6cd8d0e23bd9187..73b098bc63dfc1c61e2b574524e2d59cb0979a1a
--- 1/data/config.default.php
--- 2/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();
+ 
  ?>

diff --cc www/.htaccess
Simple merge