aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 13:36:45 -0700
committerJonathan Duran2012-05-09 13:36:45 -0700
commitd0a5239630903953d9247d12b067f1b0a3e8381b (patch)
tree98112944664620185b45cf95dfb7d03b1794d85a /js/document
parent1514f976119a9e5180a84a6afdf148bb25196bf8 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-d0a5239630903953d9247d12b067f1b0a3e8381b.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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