Raphael 738e8c65c8 Merge almost complete, 4 failures		2011-01-14 16:00:10 -08:00
..
_add_contact.html.haml	aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder	2011-01-08 13:11:53 -08:00
_add_remove_services.haml
_author_info.html.haml	aspect filters shown selected on photo and statusmessage show pages	2011-01-08 13:11:53 -08:00
_contact_list.html.haml	switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials.	2011-01-08 13:11:53 -08:00
_invitations.haml
_mail_signup_form.erb
_notification.haml
_public_explain.haml
_publisher.haml	rails autoescapes in the link_to	2011-01-13 17:16:53 -08:00
_publisher.mobile.haml
_reshare.haml	rails autoescapes in the link_to	2011-01-13 17:16:53 -08:00
_stream.haml	collapsed aspect_listing and contact_listing on aspects/index	2011-01-08 13:11:53 -08:00
_stream_element.haml	fade in aspect badges on stream	2011-01-08 15:24:03 -08:00