mirror of
https://github.com/go-gitea/gitea
synced 2025-07-12 13:37:20 +00:00
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
This commit is contained in:
@ -21,15 +21,15 @@ import (
|
||||
|
||||
"github.com/Unknwon/cae/zip"
|
||||
"github.com/Unknwon/com"
|
||||
"github.com/go-gitea/git"
|
||||
"github.com/go-gitea/gitea/modules/bindata"
|
||||
"github.com/go-gitea/gitea/modules/log"
|
||||
"github.com/go-gitea/gitea/modules/markdown"
|
||||
"github.com/go-gitea/gitea/modules/process"
|
||||
"github.com/go-gitea/gitea/modules/setting"
|
||||
"github.com/go-gitea/gitea/modules/sync"
|
||||
api "github.com/go-gitea/go-sdk/gitea"
|
||||
"code.gitea.io/gitea/modules/bindata"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
"code.gitea.io/gitea/modules/markdown"
|
||||
"code.gitea.io/gitea/modules/process"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
"code.gitea.io/gitea/modules/sync"
|
||||
"github.com/go-xorm/xorm"
|
||||
"code.gitea.io/git"
|
||||
api "code.gitea.io/go-sdk/gitea"
|
||||
version "github.com/mcuadros/go-version"
|
||||
ini "gopkg.in/ini.v1"
|
||||
)
|
||||
|
Reference in New Issue
Block a user