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 /modules/base/tool_test.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 'modules/base/tool_test.go')
| -rw-r--r-- | modules/base/tool_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index 093e479a38..ec839e5e10 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -3,7 +3,7 @@ package base import ( "testing" - "github.com/go-gitea/gitea/modules/setting" + "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" "strk.kbt.io/projects/go/libravatar" ) |