Konrad Langenberg 8b4a48c4bc Merge branch 'master' of https://github.com/go-gitea/gitea ... Signed-off-by: Konrad <konrad@kola-entertainments.de> # Conflicts: # models/migrations/migrations.go # models/migrations/v42.go		2017-09-24 13:20:34 +02:00
..
api_org.go	Golint fixed for modules/context	2016-11-25 14:53:59 +08:00
api.go	Resolved Conflicts	2017-09-12 14:19:20 +02:00
auth.go	Golint fixed for modules/setting (#262)	2016-11-27 18:14:25 +08:00
context.go	Always return valid go-get meta, even if unauthorized (#2010)	2017-06-26 09:06:40 +08:00
org.go	Golint fixed for modules/setting (#262)	2016-11-27 18:14:25 +08:00
repo.go	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-09-24 13:20:34 +02:00