Merge "Merge branch 'stable-3.1'"

2019-10-22 20:51:20 +00:00
parent 547b110806 af476fa4b9
commit 702df5f753
6 changed files with 557 additions and 233 deletions
--- a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
@@ -78,6 +78,7 @@
    'text/x-scss': 'scss',
    'text/x-scheme': 'scheme',
    'text/x-shell': 'shell',
+    'text/x-soy': 'soy',
    'text/x-spreadsheet': 'excel',
    'text/x-sh': 'bash',
    'text/x-sql': 'sql',