diff options
| author | Kruti Shah | 2012-07-03 15:11:42 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-07-03 15:11:42 -0700 |
| commit | 63f1d6ddb28e4e8c4d624e764785c58666ebe5cb (patch) | |
| tree | 415b48498686136a8d7656a5b836a41de21c97fb /node_modules/descriptor.json | |
| parent | 14f30bb927f2cb4a27c81fd6ee4e8d9af46b4404 (diff) | |
| parent | fcae5717dab144c4d961b94510aed11d01568345 (diff) | |
| download | ninja-63f1d6ddb28e4e8c4d624e764785c58666ebe5cb.tar.gz | |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-RefactorCode
Diffstat (limited to 'node_modules/descriptor.json')
| -rw-r--r-- | node_modules/descriptor.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json index 9a2177c6..c25354ee 100644 --- a/node_modules/descriptor.json +++ b/node_modules/descriptor.json | |||
| @@ -215,8 +215,8 @@ | |||
| 215 | "montage/ui/bluemoon/slider.reel/slider.css", | 215 | "montage/ui/bluemoon/slider.reel/slider.css", |
| 216 | "montage/ui/bluemoon/slider.reel/slider.html", | 216 | "montage/ui/bluemoon/slider.reel/slider.html", |
| 217 | "montage/ui/bluemoon/slider.reel/slider.js", | 217 | "montage/ui/bluemoon/slider.reel/slider.js", |
| 218 | "montage/ui/bluemoon/tabs.reel/tabs.js", | 218 | "montage/ui/bluemoon/tabs.reel/tabs.css", |
| 219 | "montage/ui/bluemoon/tabs.reel/tabs.js", | 219 | "montage/ui/bluemoon/tabs.reel/tabs.html", |
| 220 | "montage/ui/bluemoon/tabs.reel/tabs.js", | 220 | "montage/ui/bluemoon/tabs.reel/tabs.js", |
| 221 | "montage/ui/bluemoon/textarea.reel/textarea.css", | 221 | "montage/ui/bluemoon/textarea.reel/textarea.css", |
| 222 | "montage/ui/bluemoon/textarea.reel/textarea.html", | 222 | "montage/ui/bluemoon/textarea.reel/textarea.html", |