kolaente a25e1dd0cf Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/migrations/migrations.go # models/migrations/v59.go # modules/auth/repo_form.go		2018-04-03 11:16:37 +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-04-03 11:16:37 +02:00