]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
authorHypolite Petovan <ben.lort@gmail.com>
Sun, 22 Jan 2017 14:02:59 +0000 (09:02 -0500)
committerHypolite Petovan <ben.lort@gmail.com>
Sun, 22 Jan 2017 14:02:59 +0000 (09:02 -0500)

Trivial merge