Michael Gapczynski 702c27b0e6 Merge branch 'master' into external_storage_ui_feedback ... Conflicts: apps/files_external/js/settings.js apps/files_external/lib/smb.php apps/files_external/templates/settings.php lib/files/storage/common.php		2013-02-19 19:12:14 -05:00
..
cache	Cache: hash long storage ids to ensure they fit in the database	2013-02-15 22:11:39 +01:00
storage	Merge branch 'master' into external_storage_ui_feedback	2013-02-19 19:12:14 -05:00
stream	add oc:// streamwrapper to provide access to ownCloud's virtual filesystem	2013-01-28 15:35:30 +01:00
filesystem.php	Merge pull request #1731 from owncloud/unknown-freespace	2013-02-19 15:18:12 -08:00
mapper.php	class Mapper no respects an unchanged physical root which will be excluded from slugifying the path	2013-02-15 17:42:17 +01:00
mount.php	Cache: hash long storage ids to ensure they fit in the database	2013-02-15 22:11:39 +01:00
view.php	Style-fix: Breakup long lines	2013-02-14 08:38:37 +01:00