]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
authorMichael Vogel <icarus@dabo.de>
Thu, 21 Jan 2016 22:05:02 +0000 (23:05 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 21 Jan 2016 22:05:02 +0000 (23:05 +0100)
1  2 
include/items.php

Simple merge