Glitch-Shrike/lib/mastodon
Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
..
cli Extract verify options method in search cli (#25121) 2023-06-01 14:35:05 +02:00
migration_helpers.rb
migration_warning.rb
premailer_webpack_strategy.rb Autofix Rubocop Regex Style rules (#23690) 2023-06-06 14:50:51 +02:00
rack_middleware.rb
redis_config.rb
sidekiq_middleware.rb
snowflake.rb
version.rb