David Svantesson 5316bdfd85 Merge remote-tracking branch 'upstream/master' into team-grant-all-repos ... # Conflicts: # models/migrations/migrations.go # models/migrations/v90.go # models/repo.go		2019-10-05 14:41:44 +02:00
..
convert.go	Merge remote-tracking branch 'upstream/master' into team-grant-all-repos	2019-10-05 14:41:44 +02:00
utils.go	Update import paths from github.com/go-gitea to code.gitea.io (#135)	2016-11-10 17:24:48 +01:00