domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests 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 2016-11-10 21:05:52 +01:00
commit b0ddced2b5
No known key found for this signature in database
GPG key ID: BE39A108C4DDA755
168 changed files with 478 additions and 475 deletions
Download patch file Download diff file Expand all files Collapse all files

6
models/admin.go
View file

@ -14,9 +14,9 @@ import (
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)
type NoticeType int