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
..
routes.go	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-09-24 13:20:34 +02:00