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 /models/login_source.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 'models/login_source.go')
| -rw-r--r-- | models/login_source.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/models/login_source.go b/models/login_source.go index 988546f41e..0d9226a583 100644 --- a/models/login_source.go +++ b/models/login_source.go @@ -19,9 +19,9 @@ import ( "github.com/go-xorm/core" "github.com/go-xorm/xorm" - "github.com/go-gitea/gitea/modules/auth/ldap" - "github.com/go-gitea/gitea/modules/auth/pam" - "github.com/go-gitea/gitea/modules/log" + "code.gitea.io/gitea/modules/auth/ldap" + "code.gitea.io/gitea/modules/auth/pam" + "code.gitea.io/gitea/modules/log" ) type LoginType int |