1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +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:
Thibault Meyer
2016-11-10 21:05:52 +01:00
168 changed files with 478 additions and 475 deletions

View File

@@ -13,9 +13,9 @@ import (
"github.com/go-xorm/xorm"
api "github.com/go-gitea/go-sdk/gitea"
api "code.gitea.io/go-sdk/gitea"
"github.com/go-gitea/gitea/modules/base"
"code.gitea.io/gitea/modules/base"
)
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")