1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
OwncloudContactsOfficial/css
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
2011-12-28 10:14:59 +01:00
..
formtastic.css Contacts: support multiple phone type parameter 2011-11-23 21:07:32 +01:00
styles.css Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 2011-12-28 10:14:59 +01:00