From: Michael <heluecht@pirati.ca>
Date: Tue, 12 Jan 2021 21:14:28 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into item-view
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=122ad0af14f046c2462a03fe33967dc41abfc8b5;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into item-view
---

122ad0af14f046c2462a03fe33967dc41abfc8b5
diff --cc static/dbview.config.php
index cb41d06376,5c18364262..cd835ddfae
mode 100755,100644..100644
--- a/static/dbview.config.php
+++ b/static/dbview.config.php