aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/package.json
diff options
context:
space:
mode:
authorKruti Shah2012-06-20 15:12:48 -0700
committerKruti Shah2012-06-20 15:12:48 -0700
commit1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch)
tree26ff4c6c5a94accfd5801f124244d3eef152a5c7 /node_modules/montage/package.json
parent1ce4bd7033a413c7697888e5712f278219d6d095 (diff)
parent782b66c783df4a9c36fa240cc77900e69b9130cf (diff)
downloadninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'node_modules/montage/package.json')
-rwxr-xr-xnode_modules/montage/package.json2
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": {