Michael Gapczynski 82d81e8d39 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
..
share	Contacts: Check format parameter	2012-08-10 14:40:43 +02:00
VCFExportPlugin.php	Damn, that Jenkins dude is tough ;)	2012-07-21 00:43:01 +02:00
addressbook.php	Start adding permission checks for addressbooks	2012-08-08 21:43:02 -04:00
app.php	Merge branch 'master' into share_api	2012-08-09 11:38:22 -04:00
connector_sabre.php	Line length...	2012-08-02 05:02:36 +02:00
hooks.php	Damn, that Jenkins dude is tough ;)	2012-07-21 00:43:01 +02:00
search.php	Coding style.	2012-07-20 00:18:23 +02:00
vcard.php	Merge branch 'share_api'	2012-08-19 22:29:01 -04:00