Merge pull request #5320 from smockle/master

redmunds · redmunds · commit 89d6bed21b7d · 2013-09-27T11:16:53.000-07:00
Apply HTML sytax highlighting to ASP.NET MVC View Master Page (.master) ...
diff --git a/src/language/languages.json b/src/language/languages.json
@@ -36,7 +36,7 @@
     "html": {
         "name": "HTML",
         "mode": ["htmlmixed", "text/x-brackets-html"],
-        "fileExtensions": ["html", "htm", "shtm", "shtml", "xhtml", "cfm", "cfml", "cfc", "dhtml", "xht", "tpl", "twig", "hbs", "handlebars", "kit", "jsp", "aspx", "asp"],
+        "fileExtensions": ["html", "htm", "shtm", "shtml", "xhtml", "cfm", "cfml", "cfc", "dhtml", "xht", "tpl", "twig", "hbs", "handlebars", "kit", "jsp", "aspx", "asp", "master"],
         "blockComment": ["<!--", "-->"]
     },
     
