diff options
| author | Peter Smit <peter@smitmail.eu> | 2015-02-12 14:25:07 +0200 |
|---|---|---|
| committer | Peter Smit <peter@smitmail.eu> | 2015-02-12 14:25:07 +0200 |
| commit | 6c1ee384f1a45ed97f39b085209bcb79cafd9145 (patch) | |
| tree | 0798c98ff2fa93324edae6cfcb539cf51fc4b7fd /cmd/dump.go | |
| parent | 0a4cda0dd4d7c906668d9d2e283fbe9ebe2e1608 (diff) | |
| parent | 0d158e569b0c19614b5e946849e8b7a8e4a75015 (diff) | |
| download | gitea-6c1ee384f1a45ed97f39b085209bcb79cafd9145.tar.gz gitea-6c1ee384f1a45ed97f39b085209bcb79cafd9145.zip | |
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
Diffstat (limited to 'cmd/dump.go')
0 files changed, 0 insertions, 0 deletions