diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-04-26 18:34:58 -0600 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-04-26 18:34:58 -0600 |
| commit | 89b68bdd4502f1c82f5b0686f7e0cf34a274f8a5 (patch) | |
| tree | 464181806f87f00a1bdecb2ddcd57114fcd16370 /modules/base | |
| parent | 597387ad4092dc0041dd6cd7c172c8d618d9fe4f (diff) | |
| parent | 1b734501bdbec3a0ff04458944683eae0990d9ae (diff) | |
| download | gitea-89b68bdd4502f1c82f5b0686f7e0cf34a274f8a5.tar.gz gitea-89b68bdd4502f1c82f5b0686f7e0cf34a274f8a5.zip | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
modules/base/conf.go
Diffstat (limited to 'modules/base')
| -rw-r--r-- | modules/base/conf.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/base/conf.go b/modules/base/conf.go index e89c67bc1b..9a9adfdac6 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -342,7 +342,6 @@ func NewConfigContext() { LogInRememberDays = Cfg.MustInt("security", "LOGIN_REMEMBER_DAYS") CookieUserName = Cfg.MustValue("security", "COOKIE_USERNAME") CookieRememberName = Cfg.MustValue("security", "COOKIE_REMEMBER_NAME") - PictureService = Cfg.MustValue("picture", "SERVICE") // Determine and create root git reposiroty path. |