mastodon/lib
Claire e855df149b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.
2021-10-25 20:28:51 +02:00
..
action_dispatch
active_record
assets
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
paperclip Add S3_FORCE_SINGLE_REQUEST env var to work around S3 compatibility issues (#16866) 2021-10-18 18:29:04 +02:00
rails
redis
sanitize_ext
tasks Merge branch 'main' into glitch-soc/merge-upstream 2021-10-25 20:28:51 +02:00
templates
terrapin
webpacker
cli.rb Fix tootctl self-destruct not sending Delete activities for recently-suspended accounts (#16688) 2021-10-14 19:59:28 +02:00
enumerable.rb
exceptions.rb