1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-18 07:52:21 +01:00
Michael Gapczynski d80d66fe58 Merge branch 'share_api'
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
2012-08-19 22:29:01 -04:00
..
2012-08-06 13:49:54 -04:00
2012-07-20 17:11:13 +02:00
2012-08-14 17:23:26 +02:00