]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into archive-contact
authorMichael <heluecht@pirati.ca>
Mon, 4 Dec 2017 19:05:53 +0000 (19:05 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 4 Dec 2017 19:05:53 +0000 (19:05 +0000)
commit3bb53967f4f0bd82210197717a1bed2e79db118b
tree33582fefa56c931de304ffce2d1b6662b5140100
parentca41e9154d147317ab315cdac8592fb1a1ffae66
parent2aa5af4a4a3fd51ad7ee532351a299e4ed153696
Merge remote-tracking branch 'upstream/develop' into archive-contact
include/items.php
src/Object/Contact.php