aboutsummaryrefslogtreecommitdiffstats
path: root/models/access.go
diff options
context:
space:
mode:
authorThibault Meyer <meyer.thibault@gmail.com>2016-11-10 21:05:52 +0100
committerThibault Meyer <meyer.thibault@gmail.com>2016-11-10 21:05:52 +0100
commitb0ddced2b5b8338975e4d9b0d066fd9553574a43 (patch)
treea976a0f49a506b8a5333500e0b0a41d635558df4 /models/access.go
parenta4454f5d0fbeaacb94668012acbb4296465cb28f (diff)
parent4247304f5aeb791e3e201947478eef4964744146 (diff)
downloadgitea-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/access.go')
-rw-r--r--models/access.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/models/access.go b/models/access.go
index 3c3655ead6..d18e759fec 100644
--- a/models/access.go
+++ b/models/access.go
@@ -7,7 +7,7 @@ package models
import (
"fmt"
- "github.com/go-gitea/gitea/modules/log"
+ "code.gitea.io/gitea/modules/log"
)
type AccessMode int