kolaente cf6d426e09 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/v68.go		2018-07-06 23:51:49 +02:00
..
conf	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-07-06 23:51:49 +02:00