]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
authorHypolite Petovan <ben.lort@gmail.com>
Sun, 12 Mar 2017 15:19:37 +0000 (11:19 -0400)
committerHypolite Petovan <ben.lort@gmail.com>
Sun, 12 Mar 2017 15:19:37 +0000 (11:19 -0400)

Trivial merge