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

Conflicts:
	conf/app.ini
This commit is contained in:
Unknown committed 2014-03-25 06:54:22 -04:00
commit e95be2cb3e
52 files changed
+424 -263

No files matched your search

+1 -1
View File
@@ -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)