Merge branch 'master' into feat/approval

# Conflicts:
#	vendor/vendor.json
This commit is contained in:
Jonas Franz
2018-05-22 17:53:02 +02:00
294 changed files with 12239 additions and 32702 deletions
+1
View File
@@ -119,6 +119,7 @@ func NewMacaron() *macaron.Macaron {
Secret: setting.SecretKey,
Cookie: setting.CSRFCookieName,
SetCookie: true,
Secure: setting.SessionConfig.Secure,
Header: "X-Csrf-Token",
CookiePath: setting.AppSubURL,
}))