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

Conflicts:
	modules/base/conf.go
This commit is contained in:
Unknown 2014-04-26 18:34:58 -06:00
commit 89b68bdd45

View file

@ -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.