diff options
| author | Valerio Virgillito | 2012-07-17 11:29:09 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-17 11:29:09 -0700 |
| commit | 58e86247524cc2d545bd6884f1b5c9fdba3b9164 (patch) | |
| tree | 53305d354fce502ee39378babf47ace6c91ce2fd /imports/codemirror/mode/rst/rst.js | |
| parent | 0f0cffd4df85e7adf5081fe66c768c70b2ead9b3 (diff) | |
| parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
| download | ninja-58e86247524cc2d545bd6884f1b5c9fdba3b9164.tar.gz | |
Merge branch 'refs/heads/master' into v0.7.1
Diffstat (limited to 'imports/codemirror/mode/rst/rst.js')
| -rw-r--r-- | imports/codemirror/mode/rst/rst.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/rst/rst.js b/imports/codemirror/mode/rst/rst.js index 411bac56..c4ecdf4c 100644 --- a/imports/codemirror/mode/rst/rst.js +++ b/imports/codemirror/mode/rst/rst.js | |||
| @@ -321,6 +321,6 @@ CodeMirror.defineMode('rst', function(config, options) { | |||
| 321 | return token; | 321 | return token; |
| 322 | } | 322 | } |
| 323 | }; | 323 | }; |
| 324 | }); | 324 | }, "python"); |
| 325 | 325 | ||
| 326 | CodeMirror.defineMIME("text/x-rst", "rst"); | 326 | CodeMirror.defineMIME("text/x-rst", "rst"); |