mastodon/lib
Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
..
active_record Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
assets
chewy
devise/strategies Move lib/devise/* to lib/devise/strategies/* (#27638) 2023-11-29 10:10:21 +00:00
generators/post_deployment_migration
linter
mastodon Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream 2024-01-11 13:24:20 +01: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 Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 2023-12-17 23:04:16 +01:00
simple_navigation
tasks Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream 2024-01-13 12:11:29 +01:00
templates/haml/scaffold
terrapin
webpacker
exceptions.rb
http_extensions.rb
premailer_webpack_strategy.rb Move lib/mastodon/premailer_webpack_strategy to lib/ (#27636) 2023-11-29 10:08:55 +00:00
public_file_server_middleware.rb