Bart Visscher c2d29f20f7 Merge remote-tracking branch 'git://github.com/susinths/apps' ... Conflicts: calendar/ajax/event/edit.form.php calendar/lib/object.php		2012-10-27 16:36:06 +02:00
..
sabre	adding space between) and {	2012-09-07 15:21:03 +02:00
share	Update getChildren() for calendar and addressbook share backends	2012-09-08 23:11:40 -04:00
addressbook.php	Unshare Calendar/Event/Addressbook/Contact on delete.	2012-10-16 22:25:03 +02:00
app.php	adding space between) and {	2012-09-07 15:21:03 +02:00
hooks.php	Update Contacts and Calendar with namespaces for Sabre 1.7.1	2012-10-18 23:08:26 +02:00
search.php	Merge branch 'master' into routing	2012-09-07 15:45:35 +02:00
vcard.php	Merge remote-tracking branch 'git://github.com/susinths/apps'	2012-10-27 16:36:06 +02:00