kolaente 16533e9e2e Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/issue.go # models/issue_comment.go # options/locale/locale_en-US.ini # public/js/index.js # templates/repo/issue/view_content/comments.tmpl # templates/repo/issue/view_content/sidebar.tmpl		2018-05-01 21:51:05 +02:00
..
routes.go	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-05-01 21:51:05 +02:00