kolaente 288cd40402 Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/issue_comment.go # models/migrations/migrations.go # models/migrations/v64.go		2018-05-09 18:34:09 +02:00
..
v1	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-05-09 18:34:09 +02:00