mirror of https://github.com/tootsuite/mastodon
20d01a954e
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”. |
||
|---|---|---|
| .. | ||
| exports | ||
| two_factor_authentication | ||
| applications_controller.rb | ||
| base_controller.rb | ||
| deletes_controller.rb | ||
| exports_controller.rb | ||
| featured_tags_controller.rb | ||
| flavours_controller.rb | ||
| identity_proofs_controller.rb | ||
| imports_controller.rb | ||
| migrations_controller.rb | ||
| notifications_controller.rb | ||
| preferences_controller.rb | ||
| profiles_controller.rb | ||
| sessions_controller.rb | ||
| two_factor_authentications_controller.rb | ||