This reverts commit 9f4035ab019803fc53844e70884b0519142deb18. Conflicts: app/views/services/_remote_friend.html.haml app/views/users/getting_started/_step_3.html.haml refactored invitations, added them to the last page fixed styling on adding an aspect to the aspect list added a facebook for person edit aspect memberships touched up and simplified sign-up flow fix styling on step 3 |
||
|---|---|---|
| .. | ||
| _add_contact.html.haml | ||
| _add_remove_services.haml | ||
| _author_info.html.haml | ||
| _author_info.mobile.haml | ||
| _contact_list.html.haml | ||
| _invitations.haml | ||
| _mail_signup_form.erb | ||
| _notification.haml | ||
| _public_explain.haml | ||
| _publisher.html.haml | ||
| _publisher.mobile.haml | ||
| _reshare.haml | ||
| _stream.haml | ||
| _stream_element.html.haml | ||
| _stream_element.mobile.haml | ||