diff options
| author | Jonathan Duran | 2012-07-03 11:56:26 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-07-03 11:56:26 -0700 |
| commit | 0771c013abc4389913ff6cebf1ae6408000d50e6 (patch) | |
| tree | 1160a274ac8f51aa908b6e5f7f74a2ccbe95d932 /node_modules/descriptor.json | |
| parent | 9cd3ae740b67e192f06ee000eba759ca68bdea52 (diff) | |
| parent | fcae5717dab144c4d961b94510aed11d01568345 (diff) | |
| download | ninja-0771c013abc4389913ff6cebf1ae6408000d50e6.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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", |