]> git.mxchange.org Git - friendica.git/commit
Merge branch 'develop' into rewrites/coding-convention-split2-1-2
authorRoland Häder <Quix0r@users.noreply.github.com>
Sat, 8 Apr 2017 16:45:59 +0000 (18:45 +0200)
committerGitHub <noreply@github.com>
Sat, 8 Apr 2017 16:45:59 +0000 (18:45 +0200)
commit3d1626781d473330b9d11ddea8e68d7fee237708
tree3ece18265bbc665fc4ac95e1944f577a134c778f
parent20f8b63fca3ec57137a85d7181ccddcda38ba5b9
parent42cc8d729b946f5058e5dcf4a74d86e898ed8f44
Merge branch 'develop' into rewrites/coding-convention-split2-1-2
include/bb2diaspora.php
include/bbcode.php