Dan Hansen 4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged ... Conflicts: spec/javascripts/stream-spec.js		2011-08-21 20:57:01 -05:00
..
_add_remove_services.haml	fixed missing i18n key for no_services	2011-07-13 12:17:47 +08:00
_aspect_dropdown.html.haml	Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""	2011-08-18 16:48:20 -07:00
_author_info.html.haml
_author_info.mobile.haml
_contact_list.html.haml	moved facebook friend inviter/finder into contacts layout & re-added search	2011-08-12 17:05:01 -07:00
_contact_sidebar.html.haml	moved facebook friend inviter/finder into contacts layout & re-added search	2011-08-12 17:05:01 -07:00
_donate.html.erb	completed donate option	2011-07-29 11:33:30 -07:00
_footer.mobile.haml
_invitations.haml	Move Facebook inviter view into the contacts layout, rather than a facebox	2011-08-12 17:05:01 -07:00
_mail_signup_form.erb
_public_explain.haml
_publisher.html.haml	Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""	2011-08-18 16:48:20 -07:00
_publisher.mobile.haml
_right_sections.html.haml	dg rs; seed bob with facebook friends & fixed invitation view	2011-08-12 17:05:00 -07:00
_settings_nav.haml
_stream.haml	DG IZ reshare retractions is WIP	2011-07-21 18:22:17 -07:00
_stream_element.html.haml	Show ajax loader and hide the hide icon when hiding a post.	2011-08-22 00:38:34 +02:00
_stream_element.mobile.haml	That fixes the mobile-interface for now	2011-07-28 21:45:42 +02:00