summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2009-07-30 09:43:37 +0200
committerYorhel <git@yorhel.nl>2009-07-30 09:45:00 +0200
commit4e1a84ae9ee6dbc5ea18517a9112ae1821797eb7 (patch)
tree2a13682473e2e7dc9a1bb59fe0e32f1f294b77dd /data
parentd6a9d1c5d613c13cf9de4ecf254ba864341975be (diff)
parenta04360aa66453809395a09a66ccd63e46a4cf519 (diff)
Merge branch 'auth' of git://3decibels.net/vndb into beta
Conflicts: util/dump.sql util/updates/update_2.6.sql Also updated ChangeLog and made some tiny style changes.
Diffstat (limited to 'data')
-rw-r--r--data/global.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/global.pl b/data/global.pl
index 83cb42fd..09382411 100644
--- a/data/global.pl
+++ b/data/global.pl
@@ -20,7 +20,7 @@ our %S = (%S,
site_title => 'Yet another VNDB clone',
skin_default => 'angel',
cookie_domain => '.vndb.org',
- cookie_key => 'any-private-string-here',
+ global_salt => 'any-private-string-here',
source_url => 'http://git.blicky.net/vndb.git/?h=master',
admin_email => 'contact@vndb.org',
sharedmem_key => 'VNDB',