Merge remote-tracking branch 'upstream/master' into zacharysarah-merged-master-dev-1.18

This commit is contained in:
zacharysarah
2020-03-03 12:07:32 -08:00
115 changed files with 3895 additions and 613 deletions
+2 -1
View File
@@ -30,7 +30,6 @@ aliases:
- onlydole
- parispittman
- vonguard
- onlydole
sig-docs-de-owners: # Admins for German content
- bene2k1
- mkorbi
@@ -49,6 +48,7 @@ aliases:
- kbarnard10
- kbhawkey
- makoscafee
- onlydole
- Rajakavitha1
- sftim
- steveperry-53
@@ -67,6 +67,7 @@ aliases:
- kbarnard10
- kbhawkey
- makoscafee
- onlydole
- rajakavitha1
- sftim
- steveperry-53