diff options
| author | Jon Reid | 2012-07-03 13:09:08 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-07-03 13:09:08 -0700 |
| commit | b05173c892ebbdb5a7568d3904011ab1bfa695a3 (patch) | |
| tree | 753d879f92e00dae0124f70807c02b6a8a86dc8d /node_modules/descriptor.json | |
| parent | 7e997cac27b4fcb1a30ab53ab5d2114eacfb9222 (diff) | |
| parent | d01efeb5918622783f1315136ccdb38f82ad33bb (diff) | |
| download | ninja-b05173c892ebbdb5a7568d3904011ab1bfa695a3.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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", |