Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-07 03:28:52 +02:00
Code Issues Activity

Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries

Browse Source 
# Conflicts:
#	models/git_diff.go
#	models/issue.go
#	models/org.go
#	models/pull.go
#	models/repo.go
This commit is contained in:
Thibault Meyer committed 2016-11-10 21:05:52 +01:00
2 parents a4454f5d0f 4247304f5a
commit b0ddced2b5
168 files changed
+478 -475
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

models/mail.go
+5 -5
View File
@@ -12,11 +12,11 @@ import (
"gopkg.in/gomail.v2"
"gopkg.in/macaron.v1"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/mailer"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/mailer"
"code.gitea.io/gitea/modules/markdown"
"code.gitea.io/gitea/modules/setting"
)
const (