diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-09-02 13:01:09 -0400 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-09-02 13:01:09 -0400 |
| commit | 05a33107c98de3f0f6ba437abdfb7f3b15a64c26 (patch) | |
| tree | 63268a1fd560aed82e7bb0c3df41c51548326645 | |
| parent | 8b0e815d98a02ed271410c5491e7a879818ca995 (diff) | |
| parent | f19fc230d43dfcdc1f04cf7fbf611650029892bb (diff) | |
Merge branch 'dev' of github.com:gogits/gogs into dev
| -rw-r--r-- | cmd/web.go | 1 | ||||
| -rw-r--r-- | conf/locale/locale_de-DE.ini | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -95,6 +95,7 @@ func newMacaron() *macaron.Macaron { m.Use(csrf.Generate(csrf.Options{ Secret: setting.SecretKey, SetCookie: true, + Header: "X-Csrf-Token", })) m.Use(toolbox.Toolboxer(m, toolbox.Options{ HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{ diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini index 3e9936d6..19b2b5d1 100644 --- a/conf/locale/locale_de-DE.ini +++ b/conf/locale/locale_de-DE.ini @@ -1,4 +1,4 @@ -app_desc = Ein einfacher, selbst gehostetes Git-Service, geschrieben in Go. +app_desc = Ein einfacher, selbst gehosteter Git-Service, geschrieben in Go. home = Home dashboard = Dashboard |