aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data/picasa-carousel.json
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 13:36:45 -0700
committerJonathan Duran2012-05-09 13:36:45 -0700
commitd0a5239630903953d9247d12b067f1b0a3e8381b (patch)
tree98112944664620185b45cf95dfb7d03b1794d85a /node_modules/components-data/picasa-carousel.json
parent1514f976119a9e5180a84a6afdf148bb25196bf8 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-d0a5239630903953d9247d12b067f1b0a3e8381b.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'node_modules/components-data/picasa-carousel.json')
-rw-r--r--node_modules/components-data/picasa-carousel.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
index 2eb601c7..b0711b12 100644
--- a/node_modules/components-data/picasa-carousel.json
+++ b/node_modules/components-data/picasa-carousel.json
@@ -1,7 +1,7 @@
1{ 1{
2 "component": "picasa-carousel", 2 "component": "picasa-carousel",
3 3
4 "module": "montage/ui/picasa-carousel.reel", 4 "module": "montage-google/picasa-carousel.reel",
5 5
6 "name": "PicasaCarousel", 6 "name": "PicasaCarousel",
7 7