Michael Gapczynski 78cd1153f0 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
..
calendar.js	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +02:00
geo.js	make use of post instead of get	2012-06-09 14:41:26 +02:00
loader.js	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
settings.js	move calendar settings from personal settings to in app settings	2012-08-09 12:37:26 +02:00