Merges master and solves conflicts

Signed-off-by: Akash Manohar J <akash@akash.im>
kandanapp · Mar 27, 2012 · bb9ec49 · bb9ec49
2 parents c050cc8 + a8a657c
commit bb9ec49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@
 # sass-cache
 /app/assets/stylesheets/.sass-cache
 
-.bushido/*
+.bushido
 
 /public/assets
 

diff --git a/app/assets/javascripts/backbone/broadcasters/faye.js.coffee b/app/assets/javascripts/backbone/broadcasters/faye.js.coffee
@@ -28,6 +28,7 @@ class Kandan.Broadcasters.FayeBroadcaster
 
   subscribe: (channel)->
     subscription = @faye_client.subscribe channel, (data)=>
+      console.log "faye", data
       Kandan.Helpers.Channels.add_activity(data)
     subscription.errback(()->
       alert "Oops! could not connect to the server"