Merge "Merge branch 'stable-2.16'"

2019-02-05 12:41:58 +00:00
parent 0ec61df1b3 227bf939ab
commit 9a739ae0b9
1 changed files with 1 additions and 0 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
@@ -65,6 +65,7 @@
    'text/x-perl': 'perl',
    'text/x-pgsql': 'pgsql', // postgresql
    'text/x-php': 'php',
+    'text/x-properties': 'properties',
    'text/x-protobuf': 'protobuf',
    'text/x-puppet': 'puppet',
    'text/x-python': 'python',