Merge branch 'master' of github.com:gogits/gogs
Conflicts: conf/app.ini
This commit is contained in:
commit
e95be2cb3e
52 changed files with 424 additions and 263 deletions
|
@ -243,7 +243,7 @@ func newNotifyMailService() {
|
|||
}
|
||||
|
||||
func NewConfigContext() {
|
||||
var err error
|
||||
//var err error
|
||||
workDir, err := exeDir()
|
||||
if err != nil {
|
||||
fmt.Printf("Fail to get work directory: %s\n", err)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue