Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api ... Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php		2012-07-25 17:08:18 -04:00
..
calendar.js	Merge branch 'master' into calendar_import	2012-07-04 13:03:30 +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	some style fixes for calendar	2012-07-21 17:09:10 +02:00