kolaente 6733682a7a Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/issue_comment.go		2018-05-18 23:16:41 +02:00
..
defaults.go	Fix language names (#2955)	2017-11-23 12:00:48 +08:00
setting.go	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-05-18 23:16:41 +02:00