Raphael Sofaer 1af945de11 Merge branch 'master' into oauth ... Conflicts: Gemfile Gemfile.lock app/models/app_config.rb app/models/post.rb db/schema.rb public/stylesheets/sass/application.sass spec/lib/webfinger_spec.rb		2011-06-28 17:13:38 -07:00
..
_add_contact.html.haml	Get rid of manage	2011-06-24 16:55:40 -07:00
_add_remove_services.haml	nicer auth prompt. wip.	2011-06-23 12:40:47 -07:00
_author_info.html.haml
_author_info.mobile.haml
_contact_list.html.haml
_footer.mobile.haml	move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz	2011-06-16 11:17:14 -07:00
_invitations.haml
_mail_signup_form.erb
_public_explain.haml
_publisher.html.haml
_publisher.mobile.haml
_reshare.haml
_settings_nav.haml	nicer auth prompt. wip.	2011-06-23 12:40:47 -07:00
_stream.haml	move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz	2011-06-16 11:17:14 -07:00
_stream_element.html.haml	Don't force a query on like count	2011-06-05 00:32:10 -07:00
_stream_element.mobile.haml	small linebreak for cubbies view for mobile	2011-05-22 15:25:37 -07:00