aaec64a500
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml |
||
|---|---|---|
| .. | ||
| account/components | ||
| account_gallery | ||
| account_timeline | ||
| blocks | ||
| community_timeline | ||
| compose | ||
| direct_timeline | ||
| domain_blocks | ||
| emoji | ||
| favourited_statuses | ||
| favourites | ||
| follow_requests | ||
| followers | ||
| following | ||
| generic_not_found | ||
| getting_started | ||
| hashtag_timeline | ||
| home_timeline | ||
| introduction | ||
| keyboard_shortcuts | ||
| list_adder | ||
| list_editor | ||
| list_timeline | ||
| lists | ||
| mutes | ||
| notifications | ||
| pinned_statuses | ||
| public_timeline | ||
| reblogs | ||
| report | ||
| search | ||
| standalone | ||
| status | ||
| ui | ||
| video | ||