Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml |
||
---|---|---|
.. | ||
accounts | ||
apps | ||
instances | ||
lists | ||
push | ||
statuses | ||
timelines | ||
accounts_controller.rb | ||
apps_controller.rb | ||
blocks_controller.rb | ||
bookmarks_controller.rb | ||
custom_emojis_controller.rb | ||
domain_blocks_controller.rb | ||
favourites_controller.rb | ||
follow_requests_controller.rb | ||
follows_controller.rb | ||
instances_controller.rb | ||
lists_controller.rb | ||
media_controller.rb | ||
mutes_controller.rb | ||
notifications_controller.rb | ||
reports_controller.rb | ||
search_controller.rb | ||
statuses_controller.rb | ||
streaming_controller.rb |