diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /imports/codemirror/mode/xmlpure/index.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'imports/codemirror/mode/xmlpure/index.html')
| -rw-r--r-- | imports/codemirror/mode/xmlpure/index.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/imports/codemirror/mode/xmlpure/index.html b/imports/codemirror/mode/xmlpure/index.html index 721834ac..0fdac7e5 100644 --- a/imports/codemirror/mode/xmlpure/index.html +++ b/imports/codemirror/mode/xmlpure/index.html | |||
| @@ -54,6 +54,5 @@ and we're inside a comment! --> | |||
| 54 | <p><b>@date</b>: August, 2011<br/> | 54 | <p><b>@date</b>: August, 2011<br/> |
| 55 | <p><b>@github</b>: <a href='https://github.com/deebugger/CodeMirror2' target='blank'>https://github.com/deebugger/CodeMirror2</a></p> | 55 | <p><b>@github</b>: <a href='https://github.com/deebugger/CodeMirror2' target='blank'>https://github.com/deebugger/CodeMirror2</a></p> |
| 56 | 56 | ||
| 57 | <p><strong>MIME types defined:</strong> <code>application/xml</code>, <code>text/xml</code>.</p> | ||
| 58 | </body> | 57 | </body> |
| 59 | </html> | 58 | </html> |