]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into develop
authorJens Tautenhahn <shogun@tausys.de>
Mon, 14 Nov 2016 08:52:01 +0000 (09:52 +0100)
committerJens Tautenhahn <shogun@tausys.de>
Mon, 14 Nov 2016 08:52:01 +0000 (09:52 +0100)

Trivial merge