]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'hotfix_diaspora'
authorFabrixxm <fabrix.xm@gmail.com>
Wed, 20 Jan 2016 07:45:42 +0000 (08:45 +0100)
committerFabrixxm <fabrix.xm@gmail.com>
Wed, 20 Jan 2016 07:45:42 +0000 (08:45 +0100)

Trivial merge