kolaente c3a62109af Merge branch 'master' of github.com:go-gitea/gitea ... # Conflicts: # options/locale/locale_en-US.ini # templates/repo/issue/view_content/sidebar.tmpl		2018-07-16 20:40:46 +02:00
..
routes.go	Merge branch 'master' of github.com:go-gitea/gitea	2018-07-16 20:40:46 +02:00