diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-22 09:22:55 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-22 09:22:55 -0400 |
| commit | cd070b56d2f5b34236174ff04ccc459d15c4cd17 (patch) | |
| tree | 247026fa664dc46ccbb4701cabab3fb749f9ebcd /conf | |
| parent | fd1831052c3a79492643b89512282fc66f34dd8d (diff) | |
| parent | 01e781dedb3c6d48349516de0eee5cea41c077e1 (diff) | |
| download | gitea-cd070b56d2f5b34236174ff04ccc459d15c4cd17.tar.gz gitea-cd070b56d2f5b34236174ff04ccc459d15c4cd17.zip | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
conf/app.ini
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/app.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/app.ini b/conf/app.ini index 30d6c7d483..ec5fcb23b3 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -91,7 +91,7 @@ ENABLE_SET_COOKIE = true GC_INTERVAL_TIME = 86400 ; Session life time, default is 86400 SESSION_LIFE_TIME = 86400 -; Session id hash func, default is sha1 +; session id hash func, Either "sha1", "sha256" or "md5" default is sha1 SESSION_ID_HASHFUNC = sha1 ; Session hash key, default is use random string SESSION_ID_HASHKEY = |