diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /node_modules/montage/package.json | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/package.json')
| -rwxr-xr-x | node_modules/montage/package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/montage/package.json b/node_modules/montage/package.json index ce4b31d5..4e57a257 100755 --- a/node_modules/montage/package.json +++ b/node_modules/montage/package.json | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | "exclude": [ | 9 | "exclude": [ |
| 10 | "lab/benchmarks", | 10 | "lab/benchmarks", |
| 11 | "lab/sandbox", | 11 | "lab/sandbox", |
| 12 | "lab/tools", | ||
| 12 | "examples", | 13 | "examples", |
| 13 | "require/test", | 14 | "require/test", |
| 14 | "require/tests", | 15 | "require/tests", |