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/version.txt | |
| 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/version.txt')
| -rwxr-xr-x | imports/codemirror/version.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/version.txt b/imports/codemirror/version.txt index 2563e071..9d5872c6 100755 --- a/imports/codemirror/version.txt +++ b/imports/codemirror/version.txt | |||
| @@ -1 +1 @@ | |||
| Codemirror Version: 2.22 \ No newline at end of file | Codemirror Version: 2.23 \ No newline at end of file | ||