d46668d34b
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”. |
||
|---|---|---|
| .. | ||
| accounts_cli.rb | ||
| cache_cli.rb | ||
| cli_helper.rb | ||
| domains_cli.rb | ||
| emoji_cli.rb | ||
| feeds_cli.rb | ||
| media_cli.rb | ||
| migration_helpers.rb | ||
| premailer_webpack_strategy.rb | ||
| redis_config.rb | ||
| search_cli.rb | ||
| settings_cli.rb | ||
| snowflake.rb | ||
| statuses_cli.rb | ||
| version.rb | ||