]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch '3.5rc' of https://github.com/friendica/friendica into 20160906-changes
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 6 Sep 2016 19:52:33 +0000 (21:52 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 6 Sep 2016 19:52:33 +0000 (21:52 +0200)

Trivial merge