]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup
authorMichael Vogel <icarus@dabo.de>
Sun, 12 Jun 2016 19:07:45 +0000 (21:07 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 12 Jun 2016 19:07:45 +0000 (21:07 +0200)

Trivial merge