Thomas Tanghus bec1bb5e78 Merge branch 'master' of github.com:owncloud/apps into vcategories_db ... Conflicts: contacts/appinfo/app.php		2012-11-13 12:02:15 +01:00
..
addressbook	Fix return values on update.	2012-08-31 05:12:18 +02:00
categories	Use type, not app for categories.	2012-10-19 02:28:27 +02:00
contact	Merge branch 'master' of github.com:owncloud/apps into vcategories_db	2012-11-13 12:02:15 +01:00
cropphoto.php	Contacts: Implement CSRF prevention.	2012-06-14 18:00:13 +02:00
currentphoto.php	Revert "Removed text/plain header."	2012-08-03 21:32:27 +02:00
editaddress.php	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
editname.php	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
importdialog.php	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
loghandler.php	Remove stray error_log statement.	2012-10-16 22:24:03 +02:00
oc_photo.php	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
savecrop.php	Merge remote-tracking branch 'git://github.com/susinths/apps'	2012-10-27 16:36:06 +02:00
selectaddressbook.php	Addressbook selection didn't show if there was only one.	2012-09-08 03:50:38 +02:00
uploadimport.php	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
uploadphoto.php	FF complained about missing charset.	2012-08-03 21:32:27 +02:00