2 Commits

Author	SHA1	Message	Date
Bart Visscher	0365f8fd01	Remove php close at end of file	2012-08-29 20:29:43 +02:00
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