This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/lib
Claire 1a664560cc Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  We deleted it.
  Kept it removed.
- `app/javascript/packs/public.jsx`:
  Upstream changed an import, we have slightly different ones.
  Ported upstream changes.
2023-05-09 23:12:48 +02:00
..
action_controller
active_record
assets
chewy/strategy
devise
generators/post_deployment_migration
json_ld
mastodon Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream 2023-05-09 23:12:48 +02:00
paperclip
rails
redis
sanitize_ext
simple_navigation
tasks
templates/haml/scaffold
terrapin
webpacker
cli.rb
exceptions.rb
public_file_server_middleware.rb