aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data/picasa-carousel.json
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-22 13:22:26 -0700
committerPushkar Joshi2012-05-22 13:22:26 -0700
commit01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch)
treeceb527713554f506c537168e36a10452cd09ad10 /node_modules/components-data/picasa-carousel.json
parentb9262c831952e77135b79c2de7c455d5e7ff0589 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz
Merge branch 'master' into brushtool
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