Conflicts: - `Gemfile.lock`: Conflict because we had updated the `json-ld` gem to fix a yanked dependency. Kept our version of `json-ld` while updating other dependencies. |
||
|---|---|---|
| .. | ||
| cli | ||
| migration_helpers.rb | ||
| migration_warning.rb | ||
| premailer_webpack_strategy.rb | ||
| rack_middleware.rb | ||
| redis_config.rb | ||
| sidekiq_middleware.rb | ||
| snowflake.rb | ||
| version.rb | ||