]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' into develop
authorFabrixxm <fabrix.xm@gmail.com>
Tue, 22 Dec 2015 09:50:52 +0000 (10:50 +0100)
committerFabrixxm <fabrix.xm@gmail.com>
Tue, 22 Dec 2015 09:50:52 +0000 (10:50 +0100)

Trivial merge