]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
authorHypolite Petovan <ben.lort@gmail.com>
Sat, 18 Feb 2017 01:44:57 +0000 (20:44 -0500)
committerHypolite Petovan <ben.lort@gmail.com>
Sat, 18 Feb 2017 01:44:57 +0000 (20:44 -0500)

Trivial merge