You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Peter Smit 6c1ee384f1 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		10 years ago
..
members.go	Add suburl support	10 years ago
org.go	Add suburl support	10 years ago
setting.go	Update with macaron	10 years ago
teams.go	Merge remote-tracking branch 'mine/access_refactor' into access_refactor	10 years ago