gitroast/routers/org
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
2015-02-12 14:25:07 +02:00
..
members.go Add suburl support 2014-09-19 20:11:34 -04:00
org.go Add suburl support 2014-09-19 20:11:34 -04:00
setting.go Update with macaron 2014-10-06 19:12:52 -04:00
teams.go Merge remote-tracking branch 'mine/access_refactor' into access_refactor 2015-02-12 14:25:07 +02:00