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
..
api.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
app.php	moved remove and rename hook to libs/hooks.php	2012-07-05 11:35:08 +02:00
info.xml	mark the apps as part of the shipped package and increase the requirement to ownCloud 4	2012-05-18 16:06:57 +02:00
update.php	use getStorage() to get versions location	2012-07-11 11:06:29 +02:00
version	use getStorage() to get versions location	2012-07-11 11:06:29 +02:00