kolaente 37dc550bc8 Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # docs/content/doc/advanced/config-cheat-sheet.en-us.md # models/migrations/migrations.go # models/migrations/v54.go # routers/repo/pull.go		2018-01-06 22:41:44 +01:00
..
routes.go	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-01-06 22:41:44 +01:00