diff options
author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
tree | c702d67585f72cddf55932411e7100133bc58452 /imports/codemirror/version.txt | |
parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
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 | ||