From: Michael <heluecht@pirati.ca>
Date: Tue, 26 Mar 2019 21:36:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into ap-delivery-failure
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=55325f191bd90a70dd31b066a47c3c2044981278;p=friendica.git

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

55325f191bd90a70dd31b066a47c3c2044981278
diff --cc config/dbstructure.config.php
index 398f671b22,0241d1f724..4c2afc7f07
mode 100644,100755..100755
--- a/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 [