kolaente 2950021ddf Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/migrations/migrations.go # models/migrations/v58.go		2018-03-18 15:23:32 +01:00
..
routes.go	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-03-18 15:23:32 +01:00