]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
authorMichael Vogel <icarus@dabo.de>
Sat, 20 Dec 2014 08:37:33 +0000 (09:37 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 20 Dec 2014 08:37:33 +0000 (09:37 +0100)
commit1a0a80c310faf51b3c2274708162ad8d817365eb
treeaf07972eb59f043c8b182be13b63d874f863a82e
parent0bfe57bb48438588814f69547c76580c38d4ba4b
parentc86edd696ffb889851ba00b266d4f699bf39b779
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items