Merge branch 'master', remote branch 'origin' into photos_new

quartzjer · Sep 28, 2011 · d05161e · d05161e
2 parents 36c67e0 + 288f190
commit d05161e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Apps/LinkaLatte/static/index.html b/Apps/LinkaLatte/static/index.html
@@ -36,7 +36,7 @@
                 <div class="linkInfo">
                     <img class="providerIcon" />
                     <div class="fullInfo">
-                        <div class="linkLine"><img onerror="hideMe()" class="favicon" /><a target="_new" href="" class="expandedLink">http://example.com</a><span class="origLink"></span></div>
+                        <div class="linkLine"><img onerror="hideMe()" class="favicon" /><a target="_blank" href="" class="expandedLink">http://example.com</a><span class="origLink"></span></div>
                         <div class="linkFrom"></div>
                         <div class="linkDescription">This is the link description</div><div class="viewMore">&#9654; View</div>
                     </div>

diff --git a/...ntacts/migrations/1317234545000_update.js → ...ntacts/migrations/1317234546000_update.js b/...ntacts/migrations/1317234545000_update.js → ...ntacts/migrations/1317234546000_update.js
diff --git a/Collections/Contacts/sync.js b/Collections/Contacts/sync.js
@@ -46,7 +46,7 @@ exports.gatherContacts = function(cb) {
                             console.error('flickr done!');
                         });
                     } else if(svc.provides.indexOf('contact/gcontacts') >= 0) {
-                        exports.getContacts("google", "contact", svc.id, function() {
+                        exports.getContacts("gcontacts", "contact", svc.id, function() {
                             console.error('gcontacts done!');
                         });
                     } else if(svc.provides.indexOf('contact/foursquare') >= 0) {