]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1608-performance
authorMichael Vogel <icarus@dabo.de>
Mon, 1 Aug 2016 06:04:11 +0000 (08:04 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 1 Aug 2016 06:04:11 +0000 (08:04 +0200)

Trivial merge