Commit Graph
2 Commits
Author SHA1 Message Date
Michael Gapczynski 3bd3555eb3 Remove accidently added 3rd party apps 2012-07-30 10:34:12 -04:00
Michael Gapczynski bcdce09194 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