diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/document | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/document')
| -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 |