]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'friendica/develop' into develop
authorHypolite Petovan <mrpetovan@gmail.com>
Fri, 21 Oct 2016 15:27:13 +0000 (11:27 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Fri, 21 Oct 2016 15:27:13 +0000 (11:27 -0400)

Trivial merge