kolaente 172b1f054a Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/migrations/v51.go		2017-12-19 19:07:30 +01:00
..
app.ini.sample	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-12-19 19:07:30 +01:00