kolaente fae44666ec Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/migrations/migrations.go # models/migrations/v50.go		2017-12-04 10:48:37 +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	2017-12-04 10:48:37 +01:00