]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'friendica/develop' into develop
authorHypolite Petovan <mrpetovan@gmail.com>
Mon, 2 Jan 2017 22:11:05 +0000 (09:11 +1100)
committerHypolite Petovan <mrpetovan@gmail.com>
Mon, 2 Jan 2017 22:11:05 +0000 (09:11 +1100)

Trivial merge