diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2010-07-05 12:17:31 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2010-07-05 12:17:31 +0200 |
| commit | a73fbc5e32546bc693fbc45486c8c96d8f6757be (patch) | |
| tree | 57fa05d59fb2ddf3c4ee951c79e44eba1a9a37ff /config | |
| parent | 845d53414482686548ab2435d738b0b3afcd47c3 (diff) | |
| parent | 76672fe0379acfd26ac5b85c4c99040c9cb2554e (diff) | |
| download | nextcloud-server-a73fbc5e32546bc693fbc45486c8c96d8f6757be.tar.gz nextcloud-server-a73fbc5e32546bc693fbc45486c8c96d8f6757be.zip | |
Merge commit 'refs/merge-requests/27' of git://gitorious.org/owncloud/owncloud into merge
Conflicts:
inc/HTTP/WebDAV/Server/Filesystem.php
inc/lib_config.php
inc/lib_log.php
inc/lib_user.php
inc/templates/adminform.php
Diffstat (limited to 'config')
| -rwxr-xr-x[-rw-r--r--] | config/.gitignore | 0 | ||||
| -rwxr-xr-x | config/config.sample.php | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/config/.gitignore b/config/.gitignore index d09f42a2389..d09f42a2389 100644..100755 --- a/config/.gitignore +++ b/config/.gitignore diff --git a/config/config.sample.php b/config/config.sample.php index dfaaa4284d6..dc1a62f46e3 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -8,4 +8,5 @@ $CONFIG_DBHOST='localhost'; $CONFIG_DBNAME='owncloud-db-name'; $CONFIG_DBUSER='user-name'; $CONFIG_DBPASSWORD='password'; +$CONFIG_DBTABLEPREFIX = 'oc_'; ?> |