Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2

author Hypolite Petovan <mrpetovan@gmail.com>

Sun, 18 Jun 2017 22:44:34 +0000 (18:44 -0400)

committer GitHub <noreply@github.com>

Sun, 18 Jun 2017 22:44:34 +0000 (18:44 -0400)
author Hypolite Petovan <mrpetovan@gmail.com>
Sun, 18 Jun 2017 22:44:34 +0000 (18:44 -0400)
committer GitHub <noreply@github.com>
Sun, 18 Jun 2017 22:44:34 +0000 (18:44 -0400)
diff --cc include/dbstructure.php
Simple merge
diff --cc include/diaspora.php
Simple merge
author	Hypolite Petovan <mrpetovan@gmail.com>
	Sun, 18 Jun 2017 22:44:34 +0000 (18:44 -0400)
committer	GitHub <noreply@github.com>
	Sun, 18 Jun 2017 22:44:34 +0000 (18:44 -0400)
		1	2
include/dbstructure.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/diaspora.php	patch \|	diff1 \|	diff2 \|	blob \| history