mirror of
https://github.com/owncloudarchive/contacts.git
synced 2025-01-18 07:52:21 +01:00
Thomas Tanghus
c7971b4071
Merge branch 'master' into contacts_backends
Conflicts: contacts/lib/addressbook.php contacts/lib/vcard.php
Description
Contacts app for Owncloud
Languages
JavaScript
72.9%
PHP
25%
CSS
2%