davrot/forgejo_backup
1
0
Fork 0
mirror of https://codeberg.org/davrot/forgejo.git synced 2025-05-22 20:00:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries

Browse source 
# 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
commit b0ddced2b5
No known key found for this signature in database
GPG key ID: BE39A108C4DDA755
168 changed files with 478 additions and 475 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/token.go
View file

@ -10,7 +10,7 @@ import (
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
"github.com/go-gitea/gitea/modules/base"
"code.gitea.io/gitea/modules/base"
)
// AccessToken represents a personal access token.