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/repo_editor.go | |
| parent | a4454f5d0fbeaacb94668012acbb4296465cb28f (diff) | |
| parent | 4247304f5aeb791e3e201947478eef4964744146 (diff) | |
| download | gitea-b0ddced2b5b8338975e4d9b0d066fd9553574a43.tar.gz gitea-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/repo_editor.go')
| -rw-r--r-- | models/repo_editor.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/models/repo_editor.go b/models/repo_editor.go index 998c2c61a9..ba34a999f0 100644 --- a/models/repo_editor.go +++ b/models/repo_editor.go @@ -18,11 +18,11 @@ import ( "github.com/Unknwon/com" gouuid "github.com/satori/go.uuid" - "github.com/go-gitea/git" + "code.gitea.io/git" - "github.com/go-gitea/gitea/modules/log" - "github.com/go-gitea/gitea/modules/process" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/process" + "code.gitea.io/gitea/modules/setting" ) // ___________ .___.__ __ ___________.__.__ |