]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1604-item-shadow
authorMichael Vogel <icarus@dabo.de>
Sun, 3 Apr 2016 16:46:14 +0000 (18:46 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 3 Apr 2016 16:46:14 +0000 (18:46 +0200)

Trivial merge