From: Roland Häder Date: Fri, 14 Apr 2017 15:45:10 +0000 (+0200) Subject: Merge branch 'develop' into rewrites/coding-convention-split2-1-2 X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9423db628fd11c7c7290802d1311398c630c702e;p=friendica.git Merge branch 'develop' into rewrites/coding-convention-split2-1-2 Signed-off-by: Roland Haeder --- 9423db628fd11c7c7290802d1311398c630c702e