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
..
2015-02-08 21:26:14 -05:00
2014-10-08 18:29:18 -04:00
2015-02-11 21:58:37 -05:00
2014-12-06 20:22:48 -05:00
2014-04-13 03:14:43 -04:00
2015-02-11 21:58:37 -05:00
2014-12-06 20:22:48 -05:00
2015-02-09 12:27:15 +02:00
2015-02-12 14:14:45 +02:00
2014-10-24 08:56:12 -04:00
2014-10-10 21:40:51 -04:00
2015-02-11 12:04:01 -05:00