aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data/picasa-carousel.json
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-11 08:55:46 -0700
committerPushkar Joshi2012-05-11 08:55:46 -0700
commitd7d6f03257f9e938321cfea0e9f98e99cca7c397 (patch)
tree05f89cf903b26cab6233dc6dfa7c6f18b5947c2c /node_modules/components-data/picasa-carousel.json
parentde9f718b739ef2b31a161d9dac6e81d614fab853 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-d7d6f03257f9e938321cfea0e9f98e99cca7c397.tar.gz
Merge branch 'master' into pentool
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