aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorhwc4872012-05-10 16:53:53 -0700
committerhwc4872012-05-10 16:53:53 -0700
commitd1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988 (patch)
treefe0e80aa7ca2a48b7e54873346c642221267f76a /js/document
parentbabfa5f1ca4f702920d81d7e12a90b12ffbf42d8 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-d1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/templates/montage-html/package.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json
index c8bc02fb..d1e839dc 100755
--- a/js/document/templates/montage-html/package.json
+++ b/js/document/templates/montage-html/package.json
@@ -3,6 +3,7 @@
3 "lib": "" 3 "lib": ""
4 }, 4 },
5 "mappings": { 5 "mappings": {
6 "montage": "../../../../node_modules/montage/" 6 "montage": "../../../../node_modules/montage/",
7 "montage-google": "../../../../node_modules/montage-google/"
7 } 8 }
8} \ No newline at end of file 9} \ No newline at end of file