Bart Visscher 45dc7ea0be Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud ...

Conflicts:
	apps/calendar/export.php
	apps/contacts/index.php

2011-12-27 22:18:01 +01:00

..

addressbook.php

Misc. changes after review by bartv.

2011-12-16 17:42:07 +01:00

app.php

Contacts: add missing property_options template var

2011-12-18 23:10:43 +01:00

connector_sabre.php

Split OC_Contacts_Addressbook in _Addressbook and _VCard

2011-09-17 00:26:57 +02:00

hooks.php

Misc. changes after review by bartv.

2011-12-16 17:42:07 +01:00

vcard.php

Updating of contact list when activating/adding/deleting address books now works.

2011-12-11 16:26:00 +01:00