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

..

ui.tmpl

update swagger-ui (#6661)

2019-04-16 22:50:55 -04:00

v1_json.tmpl

Merge remote-tracking branch 'upstream/master' into team-grant-all-repos

2019-10-05 14:41:44 +02:00