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
..
members.go	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
org.go	Allow to set organization visibility (public, internal, private) (#1763)	2019-02-18 18:00:27 +02:00
setting.go	Fix repo_admin_change_team_access always checked in org settings (#8319)	2019-09-30 02:20:27 +03:00
teams.go	Merge remote-tracking branch 'upstream/master' into team-grant-all-repos	2019-10-05 14:41:44 +02:00