1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-30 19:52:17 +01:00
Thomas Tanghus d005c9123b Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories
Conflicts:
	apps/contacts/lib/vcard.php
	apps/contacts/templates/part.contact.php
2012-03-08 02:55:48 +01:00
..
2012-02-12 16:11:41 +01:00
2012-02-12 16:11:41 +01:00
2012-02-12 16:11:41 +01:00
2012-02-08 08:47:03 +01:00