diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2011-04-06 19:13:19 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2011-04-06 19:13:19 +0200 |
| commit | 7379805565815c576723b888a20af080248222da (patch) | |
| tree | 498c98e8b6c43c2729349b7680c6a20efcfb98f3 /data/config.php.dist | |
| parent | 1e3cd8bf6ee636a5af692b57906612d6109849cb (diff) | |
| parent | 12c77161aca2c7d76fa5154fa1f4e214106d834b (diff) | |
| download | SemanticScuttle-origin/quickform.zip SemanticScuttle-origin/quickform.tar.gz SemanticScuttle-origin/quickform.tar.bz2 | |
Merge branch 'master' into quickformorigin/quickform
Conflicts:
data/templates/bookmarks.tpl.php
data/templates/sidebar.block.search.php
data/templates/top.inc.php
doc/developers/TODO
src/SemanticScuttle/header.php
Diffstat (limited to 'data/config.php.dist')
| -rw-r--r-- | data/config.php.dist | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/config.php.dist b/data/config.php.dist index 6439478..c135e8e 100644 --- a/data/config.php.dist +++ b/data/config.php.dist @@ -88,7 +88,7 @@ $dbname = 'scuttle'; * * @var string */ -$dbhost = 'localhost'; +$dbhost = '127.0.0.1'; /*************************************************** |