Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src

author Tobias Diekershoff <tobias.diekershoff@gmx.net>

Wed, 7 Feb 2018 06:18:39 +0000 (07:18 +0100)

committer GitHub <noreply@github.com>

Wed, 7 Feb 2018 06:18:39 +0000 (07:18 +0100)
author Tobias Diekershoff <tobias.diekershoff@gmx.net>
Wed, 7 Feb 2018 06:18:39 +0000 (07:18 +0100)
committer GitHub <noreply@github.com>
Wed, 7 Feb 2018 06:18:39 +0000 (07:18 +0100)
diff --cc boot.php
Simple merge
diff --cc include/api.php
Simple merge
diff --cc src/Protocol/DFRN.php
Simple merge
author	Tobias Diekershoff <tobias.diekershoff@gmx.net>
	Wed, 7 Feb 2018 06:18:39 +0000 (07:18 +0100)
committer	GitHub <noreply@github.com>
	Wed, 7 Feb 2018 06:18:39 +0000 (07:18 +0100)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/api.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/DFRN.php	patch \|	diff1 \|	diff2 \|	blob \| history