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
..
hook.go	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
member.go	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
org.go	Add teams to repo on collaboration page. (#8045)	2019-09-23 23:08:03 +03:00
team.go	Merge remote-tracking branch 'upstream/master' into team-grant-all-repos	2019-10-05 14:41:44 +02:00