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

Conflicts: modules/base/conf.go
2014-04-26 18:34:58 -06:00 · 2014-04-26 18:34:58 -06:00 · 89b68bdd45
parent 597387ad40 1b734501bd
commit 89b68bdd45
1 changed files with 0 additions and 1 deletions
--- 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.