]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
authorHypolite Petovan <ben.lort@gmail.com>
Thu, 16 Feb 2017 03:00:02 +0000 (22:00 -0500)
committerHypolite Petovan <ben.lort@gmail.com>
Thu, 16 Feb 2017 03:00:02 +0000 (22:00 -0500)

Trivial merge