]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'friendica/develop' into develop
authorHypolite Petovan <mrpetovan@gmail.com>
Tue, 20 Dec 2016 16:59:35 +0000 (11:59 -0500)
committerHypolite Petovan <mrpetovan@gmail.com>
Tue, 20 Dec 2016 16:59:35 +0000 (11:59 -0500)

Trivial merge