Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules. |
||
|---|---|---|
| .. | ||
| cli | ||
| migration_helpers.rb | ||
| migration_warning.rb | ||
| premailer_webpack_strategy.rb | ||
| rack_middleware.rb | ||
| redis_config.rb | ||
| sidekiq_middleware.rb | ||
| snowflake.rb | ||
| version.rb | ||