Merge remote-tracking branch 'upstream/develop' into ap-delivery-failure

diff --cc config/dbstructure.config.php
index 398f671b22ac173c4204befd4f12c301bd5eccc9,0241d1f724f588c85371f30506eb657f2f4d960f..4c2afc7f078502dc30416db478ef4129b0d2e333
mode 100644,100755..100755
--- 1/config/dbstructure.config.php
--- 2/config/dbstructure.config.php
+++ b/config/dbstructure.config.php
@@@ -34,7 -34,7 +34,7 @@@
  use Friendica\Database\DBA;
  
  if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1305);
 -      define('DB_UPDATE_VERSION', 1307);
++      define('DB_UPDATE_VERSION', 1308);
  }
  
  return [

diff --cc database.sql
Simple merge