diff options
| author | Thibault Meyer <meyer.thibault@gmail.com> | 2016-11-10 21:05:52 +0100 |
|---|---|---|
| committer | Thibault Meyer <meyer.thibault@gmail.com> | 2016-11-10 21:05:52 +0100 |
| commit | b0ddced2b5b8338975e4d9b0d066fd9553574a43 (patch) | |
| tree | a976a0f49a506b8a5333500e0b0a41d635558df4 /models/issue.go | |
| parent | Rewrite XORM queries (diff) | |
| parent | Update import paths from github.com/go-gitea to code.gitea.io (#135) (diff) | |
| download | forgejo-b0ddced2b5b8338975e4d9b0d066fd9553574a43.tar.xz forgejo-b0ddced2b5b8338975e4d9b0d066fd9553574a43.zip | |
Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries
# Conflicts:
# models/git_diff.go
# models/issue.go
# models/org.go
# models/pull.go
# models/repo.go
Diffstat (limited to 'models/issue.go')
| -rw-r--r-- | models/issue.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/models/issue.go b/models/issue.go index bce42c283c..4f6d374750 100644 --- a/models/issue.go +++ b/models/issue.go @@ -15,13 +15,13 @@ import ( "time" "github.com/Unknwon/com" - api "github.com/go-gitea/go-sdk/gitea" "github.com/go-xorm/xorm" + api "code.gitea.io/go-sdk/gitea" gouuid "github.com/satori/go.uuid" - "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" ) var ( |