diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html')
-rw-r--r-- | node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html index b8b9f39a..332b2932 100644 --- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html +++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | |||
@@ -45,7 +45,7 @@ | |||
45 | } | 45 | } |
46 | }, | 46 | }, |
47 | "owner": { | 47 | "owner": { |
48 | "prototype": "montage-google/feed-reader/feed-entry.reel", | 48 | "prototype": "feed-reader/feed-entry.reel", |
49 | "properties": { | 49 | "properties": { |
50 | "element": {"#": "feed-entry"} | 50 | "element": {"#": "feed-entry"} |
51 | } | 51 | } |