Konrad Langenberg d7a2ffcc69 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/v44.go		2017-10-04 23:15:30 +02:00
..
routes.go	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-10-04 23:15:30 +02:00