mirror of https://github.com/tootsuite/mastodon
e0eebba461
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 |
||
|---|---|---|
| .. | ||
| applications | ||
| deletes | ||
| exports | ||
| flavours | ||
| follower_domains | ||
| imports | ||
| keyword_mutes | ||
| migrations | ||
| notifications | ||
| preferences | ||
| profiles | ||
| shared | ||
| two_factor_authentication | ||
| two_factor_authentications | ||