Glitch-Shrike/lib
Claire d7fcd70023 Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
2023-10-08 16:41:56 +02:00
..
active_record
assets
chewy
devise
generators/post_deployment_migration
json_ld
linter
mastodon Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream 2023-10-08 16:41:56 +02:00
paperclip Fix division by zero in video in bitrate computation code (#27129) 2023-09-25 17:07:52 +02:00
rails
redis
sanitize_ext
simple_navigation
tasks Merge branch 'main' into glitch-soc/merge-upstream 2023-09-21 15:12:00 +02:00
templates/haml/scaffold
terrapin
webpacker
exceptions.rb
http_extensions.rb
public_file_server_middleware.rb