]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorHypolite Petovan <ben.lort@gmail.com>
Wed, 15 Mar 2017 03:11:53 +0000 (23:11 -0400)
committerHypolite Petovan <ben.lort@gmail.com>
Wed, 15 Mar 2017 03:11:53 +0000 (23:11 -0400)

Trivial merge