forkjo/routers
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
..
admin able to allow insecure certification of webhook for #891 2015-02-10 21:06:59 -05:00
api/v1 Refactoring of the Access Table 2015-02-12 14:14:45 +02:00
dev Remove APP_LOGO setting 2014-09-13 03:52:51 -04:00
org Merge remote-tracking branch 'mine/access_refactor' into access_refactor 2015-02-12 14:25:07 +02:00
repo Merge remote-tracking branch 'mine/access_refactor' into access_refactor 2015-02-12 14:25:07 +02:00
user Refactoring of the Access Table 2015-02-12 14:14:45 +02:00
home.go code fix for #908, and work for #884 2015-02-06 21:16:23 -05:00
install.go Add option to provide configuration file on command line 2015-02-05 12:17:35 +02:00