merged from develop and increased DB-version

author Philipp Holzer <admin@philipp.info>

Wed, 4 Jul 2018 21:44:11 +0000 (23:44 +0200)

committer Philipp Holzer <admin@philipp.info>

Wed, 4 Jul 2018 21:44:11 +0000 (23:44 +0200)
author Philipp Holzer <admin@philipp.info>
Wed, 4 Jul 2018 21:44:11 +0000 (23:44 +0200)
committer Philipp Holzer <admin@philipp.info>
Wed, 4 Jul 2018 21:44:11 +0000 (23:44 +0200)
diff --cc src/Database/DBStructure.php
Simple merge
diff --cc src/Protocol/OStatus.php
Simple merge
author	Philipp Holzer <admin@philipp.info>
	Wed, 4 Jul 2018 21:44:11 +0000 (23:44 +0200)
committer	Philipp Holzer <admin@philipp.info>
	Wed, 4 Jul 2018 21:44:11 +0000 (23:44 +0200)
		1	2
src/Database/DBStructure.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/OStatus.php	patch \|	diff1 \|	diff2 \|	blob \| history