aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/gfm
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-09 13:36:41 -0800
committerJose Antonio Marquez2012-03-09 13:36:41 -0800
commit9a03f869ff4520431da3ac8c64b748b5fbb60339 (patch)
treedad948f012cbc7d65e0dccde273667a389ff1c6d /imports/codemirror/mode/gfm
parentb0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef (diff)
parentb4eb2f6cc1208fe5c18aa1f02a85adda25075d81 (diff)
downloadninja-9a03f869ff4520431da3ac8c64b748b5fbb60339.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'imports/codemirror/mode/gfm')
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/gfm/gfm.js2
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/gfm/index.html0
2 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/gfm/gfm.js b/imports/codemirror/mode/gfm/gfm.js
index 1e9d7d87..01afed7b 100755..100644
--- a/imports/codemirror/mode/gfm/gfm.js
+++ b/imports/codemirror/mode/gfm/gfm.js
@@ -8,7 +8,7 @@ CodeMirror.defineMode("gfm", function(config, parserConfig) {
8 "c++": "text/x-c++src", 8 "c++": "text/x-c++src",
9 java: "text/x-java", 9 java: "text/x-java",
10 csharp: "text/x-csharp", 10 csharp: "text/x-csharp",
11 "c#": "text/x-csharp", 11 "c#": "text/x-csharp"
12 }; 12 };
13 13
14 // make this lazy so that we don't need to load GFM last 14 // make this lazy so that we don't need to load GFM last
diff --git a/imports/codemirror/mode/gfm/index.html b/imports/codemirror/mode/gfm/index.html
index b27d49ab..b27d49ab 100755..100644
--- a/imports/codemirror/mode/gfm/index.html
+++ b/imports/codemirror/mode/gfm/index.html