Michael Gapczynski a1ac3767ce Merge branch 'master' into share_api ...

Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php

2012-08-09 11:38:22 -04:00

..

index.php

Some fixes for keyboard shortcuts.

2012-08-03 21:32:27 +02:00

part.contact.php

Addressbooks settings rewrite and cleanup.

2012-08-02 00:02:07 +02:00

part.cropphoto.php

Code style.

2012-07-20 17:11:13 +02:00

part.edit_address_dialog.php

Addressbooks settings rewrite and cleanup.

2012-08-02 00:02:07 +02:00

part.edit_name_dialog.php

Fix char encoding.

2012-06-16 18:38:20 +02:00

part.import.php

Calendar & Contacts: Store import progress in OC_Cache

2012-06-04 22:24:17 +02:00

part.no_contacts.php

Addressbooks settings rewrite and cleanup.

2012-08-02 00:02:07 +02:00

part.selectaddressbook.php

Refactored contacts import.

2012-07-15 04:17:30 +02:00

settings.php

Merge branch 'master' into share_api

2012-08-09 11:38:22 -04:00