Branch merge.

This commit is contained in:
Kelketek 2013-05-18 14:34:16 -05:00
commit e79f68bbe1
2 changed files with 6 additions and 7 deletions

View file

@ -514,8 +514,8 @@ except ImportError:
#######################################################################
# SECRET_KEY
#######################################################################
# This is the salt for account passwords. It is a fallback for the
# SECRET_KEY setting in settings.py, which is randomly seeded when
# settings.py is first created. If copying from here, make sure to
# change it!
# This is the salt for cryptographic hashing used by Django.
# It is a fallback for the SECRET_KEY setting in settings.py, which
# is randomly seeded when settings.py is first created. If copying
# from here, make sure to change it!
SECRET_KEY = 'changeme!(*#&*($&*(#*(&SDFKJJKLS*(@#KJAS'