mirror of
https://github.com/owncloudarchive/contacts.git
synced 2025-01-18 07:52:21 +01:00
d80d66fe58
Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php