aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/gfm
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-06 17:05:05 -0800
committerPushkar Joshi2012-03-06 17:05:05 -0800
commit794abd077a0cd4c797d3f566281deca77b184bfe (patch)
tree3bf4a83ca714def2671fe8cef93db859b0d5553f /imports/codemirror/mode/gfm
parentc155cd238b6f9e0b8191e0fc533f7bc974b762c2 (diff)
parent2e3943a8f751ec572066f168b58464c24b9f29e5 (diff)
downloadninja-794abd077a0cd4c797d3f566281deca77b184bfe.tar.gz
Merge branch 'master' into pentool
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