]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
authorHypolite Petovan <ben.lort@gmail.com>
Tue, 14 Mar 2017 14:30:04 +0000 (10:30 -0400)
committerHypolite Petovan <ben.lort@gmail.com>
Tue, 14 Mar 2017 14:30:04 +0000 (10:30 -0400)

Trivial merge