mirror of
https://github.com/owncloudarchive/contacts.git
synced 2025-01-18 07:52:21 +01:00
Thomas Tanghus
dca605b41c
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
Fixed some conflicts. Conflicts: apps/contacts/css/styles.css apps/contacts/templates/index.php
Description
Contacts app for Owncloud
Languages
JavaScript
72.9%
PHP
25%
CSS
2%