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
..
app.php	Sharing files working using share API	2012-07-10 18:56:22 -04:00
database.xml	utf8 in der DB config	2012-06-11 23:04:28 +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
version	fix remote and public.php	2012-07-13 22:44:35 +02:00