diff options
| author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
| commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
| tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /node_modules/montage/package.json | |
| parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'node_modules/montage/package.json')
| -rwxr-xr-x | node_modules/montage/package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/package.json b/node_modules/montage/package.json index 9639d393..23a8ebb5 100755 --- a/node_modules/montage/package.json +++ b/node_modules/montage/package.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "montage", | 2 | "name": "montage", |
| 3 | "version": "0.10.0", | 3 | "version": "0.11.0", |
| 4 | "description": "A UI Framework", | 4 | "description": "A UI Framework", |
| 5 | "main": "montage", | 5 | "main": "montage", |
| 6 | "overlay": { | 6 | "overlay": { |