diff options
author | Jonathan Duran | 2012-04-19 07:30:06 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-19 07:30:06 -0700 |
commit | fa7761eb547372f846a304d775e717a7ef1cbf35 (patch) | |
tree | c60e59702d66cf9b74d5b65ca64918d6e655a2eb /node_modules/montage/package.json | |
parent | 260bc6db6273258f9a05c21d178273e1c302affb (diff) | |
parent | 9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff) | |
download | ninja-fa7761eb547372f846a304d775e717a7ef1cbf35.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 6422b58d..66501166 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.3.1", | 3 | "version": "0.7.0", |
4 | "description": "A UI Framework", | 4 | "description": "A UI Framework", |
5 | "main": "montage", | 5 | "main": "montage", |
6 | "overlay": { | 6 | "overlay": { |