Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	conf/app.ini
This commit is contained in:
Unknown 2014-03-22 09:22:55 -04:00
commit cd070b56d2

View file

@ -91,7 +91,7 @@ ENABLE_SET_COOKIE = true
GC_INTERVAL_TIME = 86400 GC_INTERVAL_TIME = 86400
; Session life time, default is 86400 ; Session life time, default is 86400
SESSION_LIFE_TIME = 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_ID_HASHFUNC = sha1
; Session hash key, default is use random string ; Session hash key, default is use random string
SESSION_ID_HASHKEY = SESSION_ID_HASHKEY =