]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
authorMichael Vogel <icarus@dabo.de>
Tue, 17 Feb 2015 18:18:17 +0000 (19:18 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 17 Feb 2015 18:18:17 +0000 (19:18 +0100)
commita26d04574dc402adfb501f222cc824161aece9ea
tree6f3628d1a7af30e348f36ed2b63050a1715aa4c7
parent05319083c69f62902f32738966cb8150bf2939f0
parentfff7a070f92c65cf8927e72e6deb45c131e97a34
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
boot.php
view/templates/profile_vcard.tpl
view/theme/vier/templates/profile_vcard.tpl