]> source.dussan.org Git - gitea.git/commit
Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries
authorThibault Meyer <meyer.thibault@gmail.com>
Thu, 10 Nov 2016 20:05:52 +0000 (21:05 +0100)
committerThibault Meyer <meyer.thibault@gmail.com>
Thu, 10 Nov 2016 20:05:52 +0000 (21:05 +0100)
commitb0ddced2b5b8338975e4d9b0d066fd9553574a43
treea976a0f49a506b8a5333500e0b0a41d635558df4
parenta4454f5d0fbeaacb94668012acbb4296465cb28f
parent4247304f5aeb791e3e201947478eef4964744146
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
18 files changed:
models/access.go
models/action.go
models/admin.go
models/issue.go
models/issue_comment.go
models/issue_label.go
models/login_source.go
models/mail.go
models/org.go
models/pull.go
models/release.go
models/repo.go
models/repo_editor.go
models/repo_mirror.go
models/ssh_key.go
models/token.go
models/user.go
models/webhook.go