aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/gfm
diff options
context:
space:
mode:
authorJon Reid2012-03-06 18:08:37 -0800
committerJon Reid2012-03-06 18:08:37 -0800
commit6056fdb63b5f4690115e63ee50e8d7dac309ba64 (patch)
tree5fbe386e4c7732fb84b98c9539b186898f076c7b /imports/codemirror/mode/gfm
parentbcfb704b04587f95a13c474cf0598ba90ec3b371 (diff)
parenta12603cfcfe9d82def3b972dcbcc80f1e790ad85 (diff)
downloadninja-6056fdb63b5f4690115e63ee50e8d7dac309ba64.tar.gz
Merge branch 'Timeline-uber' into timeline-serialized
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