diff options
author | Pushkar Joshi | 2012-05-11 08:55:46 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-11 08:55:46 -0700 |
commit | d7d6f03257f9e938321cfea0e9f98e99cca7c397 (patch) | |
tree | 05f89cf903b26cab6233dc6dfa7c6f18b5947c2c /js/document/templates/montage-html | |
parent | de9f718b739ef2b31a161d9dac6e81d614fab853 (diff) | |
parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
download | ninja-d7d6f03257f9e938321cfea0e9f98e99cca7c397.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/document/templates/montage-html')
-rwxr-xr-x | js/document/templates/montage-html/package.json | 3 |
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 |