mastodon/lib
Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
2022-03-22 17:00:38 +01:00
..
action_dispatch
active_record
assets
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00
paperclip Fix some media attachments being converted with too high framerates (#17619) 2022-02-22 17:11:22 +01:00
rails
redis
sanitize_ext
tasks Merge branch 'main' into glitch-soc/merge-upstream 2022-03-12 11:51:25 +01:00
templates
terrapin
webpacker
cli.rb Add ability for admins to delete canonical email blocks (#16644) 2021-12-17 23:02:14 +01:00
enumerable.rb
exceptions.rb
sidekiq_error_handler.rb Fix warnings on Rails boot (#16946) 2021-12-27 00:47:20 +01:00