]> source.dussan.org Git - gitea.git/commit
Merge remote-tracking branch 'mine/access_refactor' into access_refactor
authorPeter Smit <peter@smitmail.eu>
Thu, 12 Feb 2015 12:25:07 +0000 (14:25 +0200)
committerPeter Smit <peter@smitmail.eu>
Thu, 12 Feb 2015 12:25:07 +0000 (14:25 +0200)
commit6c1ee384f1a45ed97f39b085209bcb79cafd9145
tree0798c98ff2fa93324edae6cfcb539cf51fc4b7fd
parent0a4cda0dd4d7c906668d9d2e283fbe9ebe2e1608
parent0d158e569b0c19614b5e946849e8b7a8e4a75015
Merge remote-tracking branch 'mine/access_refactor' into access_refactor

Conflicts:
cmd/serve.go
models/access.go
models/migrations/migrations.go
models/org.go
models/repo.go
models/user.go
modules/middleware/org.go
modules/middleware/repo.go
routers/api/v1/repo.go
routers/org/teams.go
routers/repo/http.go
routers/user/home.go
cmd/serve.go
models/access.go
models/org.go
models/user.go
modules/middleware/repo.go
routers/org/teams.go
routers/repo/http.go