]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch '3.5rc' of https://github.com/friendica/friendica into 3.5rc
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 14 Aug 2016 20:05:54 +0000 (22:05 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 14 Aug 2016 20:05:54 +0000 (22:05 +0200)

Trivial merge