kolaente 4d15f28e04 Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/migrations/migrations.go # models/migrations/v56.go		2018-01-08 19:08:13 +01: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-01-08 19:08:13 +01:00