Fixing conflict (#13773)

This commit is contained in:
Felipe
2019-04-16 20:13:08 +01:00
committed by Kubernetes Prow Robot
parent d57bbc259c
commit f1750f1d95
15 changed files with 574 additions and 0 deletions
+6
View File
@@ -150,3 +150,9 @@ aliases:
- xichengliudui
- zhangxiaoyu-zidif
- pigletfly
sig-docs-pt-owners: # Admins for Portuguese content
- femrtnz
- jcjesus
sig-docs-pt-reviews: # PR reviews for Portugese content
- femrtnz
- jcjesus