9797e04957
Conflicts: app/controllers/users_controller.rb config/locales/diaspora/en.yml db/schema.rb spec/controllers/users_controller_spec.rb spec/mailers/notifier_spec.rb |
||
|---|---|---|
| .. | ||
| _notifier_css.haml | ||
| also_commented.html.haml | ||
| also_commented.text.haml | ||
| comment_on_post.html.haml | ||
| comment_on_post.text.haml | ||
| confirm_email.html.haml | ||
| confirm_email.text.haml | ||
| liked.html.haml | ||
| liked.text.haml | ||
| mentioned.html.haml | ||
| mentioned.text.haml | ||
| private_message.html.haml | ||
| private_message.text.haml | ||
| single_admin.html.haml | ||
| single_admin.text.haml | ||
| started_sharing.html.haml | ||
| started_sharing.text.haml | ||