mirror of
https://github.com/owncloudarchive/contacts.git
synced 2025-01-19 08:52:22 +01:00
Thomas Tanghus
9a38c57df9
Merge branch 'master' into contacts_framework
Conflicts: contacts/css/contacts.css
Description
Contacts app for Owncloud
Languages
JavaScript
72.9%
PHP
25%
CSS
2%