Dan Hansen 3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged ... Conflicts: app/views/status_messages/bookmarklet.html.haml config/assets.yml db/schema.rb public/javascripts/contact-edit.js public/javascripts/publisher.js public/javascripts/view.js		2011-08-20 14:40:56 -05:00
..
_status_message.haml
bookmarklet.html.haml	Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged	2011-08-20 14:40:56 -05:00
create.js.erb
new.haml