3 Commits

Author	SHA1	Message	Date
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
Georg Ehrke	9bdd00c0f2	update htaccess file and remove remote folder	2012-05-07 11:54:42 +02:00
Georg Ehrke	7b548837df	create remote directory	2012-05-01 18:22:54 +02:00