summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2012-07-25 17:08:18 -0400
committerMichael Gapczynski <mtgap@owncloud.com>2012-07-25 17:08:18 -0400
commit30b58f56771aa54304069d40a62070c06f5308fc (patch)
treee0bb2bba21c561f96d27bb9cfc09d714aa21d332 /config
parent4d17ed2f71c8cbb0d34c039aa7953b2427ce5c78 (diff)
parentf25ccaff59c135d7f1f22196bf266916ef131b35 (diff)
downloadnextcloud-server-30b58f56771aa54304069d40a62070c06f5308fc.tar.gz
nextcloud-server-30b58f56771aa54304069d40a62070c06f5308fc.zip
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
Diffstat (limited to 'config')
-rw-r--r--config/mount.sample.php13
1 files changed, 13 insertions, 0 deletions
diff --git a/config/mount.sample.php b/config/mount.sample.php
new file mode 100644
index 00000000000..8943b6a7054
--- /dev/null
+++ b/config/mount.sample.php
@@ -0,0 +1,13 @@
+<?php return array(
+ 'global' => array(
+ '/' => array('class' => 'OC_Filestorage_Local', 'options' => array())
+ ),
+ 'group' => array(
+ 'admin' => array('/$user/files/Admin Stuff' => array('class' => 'OC_Filestorage_Local', 'options' => array()))
+ ),
+ 'user' => array(
+ 'all' => array('/$user/files/Pictures' => array('class' => 'OC_Filestorage_DAV', 'options' => array())),
+ 'MTGap' => array('/$user/files/Test' => array('class' => 'OC_Filestorage_FTP', 'options' => array()))
+ )
+ );
+?> \ No newline at end of file