1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-30 19:52:17 +01:00
Thomas Tanghus 279fc58088 Merge gitorious.org:owncloud/owncloud into vcategories
Conflicts:
	apps/contacts/ajax/saveproperty.php
	apps/contacts/lib/vcard.php
2012-03-07 23:38:44 +01:00
..
2012-01-24 23:08:40 +01:00
2012-02-02 17:54:30 +01:00
2012-02-02 17:54:30 +01:00