]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'friendica/develop' into develop
authorHypolite Petovan <ben.lort@gmail.com>
Mon, 26 Dec 2016 04:42:11 +0000 (23:42 -0500)
committerHypolite Petovan <ben.lort@gmail.com>
Mon, 26 Dec 2016 04:42:11 +0000 (23:42 -0500)

Trivial merge