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-10 14:40:43 +02:00
2012-08-09 11:38:22 -04:00
2012-08-02 05:02:36 +02:00
2012-07-21 00:43:01 +02:00
2012-07-20 00:18:23 +02:00
2012-08-19 22:29:01 -04:00