lianguan/gitea
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki 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
parent a4454f5d0f 4247304f5a
commit b0ddced2b5
168 changed files with 478 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
models/user.go
View File

@ -24,14 +24,14 @@ import (
"github.com/go-xorm/xorm"
"github.com/nfnt/resize"
"github.com/go-gitea/git"
api "github.com/go-gitea/go-sdk/gitea"
"code.gitea.io/git"
api "code.gitea.io/go-sdk/gitea"
"github.com/go-gitea/gitea/modules/avatar"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/setting"
"code.gitea.io/gitea/modules/avatar"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markdown"
"code.gitea.io/gitea/modules/setting"
)
type UserType int