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
..
index.php	Change image links to use imagePath function	2012-08-12 22:30:13 +02:00
part.contact.php	Removed stray img element.	2012-08-19 17:05:45 +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	Automatically check radio when new addressbook fields get focus.	2012-08-13 15:07:15 +02:00
settings.php	Merge branch 'master' into share_api	2012-08-09 11:38:22 -04:00