diff options
| author | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
| commit | 081f17954c735fc8b946d72a25b0ee60d370ef9b (patch) | |
| tree | de7b50f2d02365df897ef4356f953d3833c9cabd /js/components/package.json | |
| parent | 47df0aff81c25334b129047bb227ea5015357eda (diff) | |
| parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
| download | ninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz | |
Merge branch 'refs/heads/master' into components
Conflicts:
js/components/treeview/ninja-leaf.reel/ninja-leaf.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/package.json')
| -rw-r--r-- | js/components/package.json | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/js/components/package.json b/js/components/package.json deleted file mode 100644 index f3a6f0e0..00000000 --- a/js/components/package.json +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | { | ||
| 2 | "directories": { | ||
| 3 | "lib": "../../" | ||
| 4 | }, | ||
| 5 | "mappings": { | ||
| 6 | "montage": "../../node_modules/montage/" | ||
| 7 | } | ||
| 8 | } \ No newline at end of file | ||