mastodon/app
Claire 954e052b07 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.
2022-02-22 18:06:29 +01:00
..
chewy
controllers
helpers
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
mailers
models Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
policies
presenters
serializers
services
validators
views Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-12 11:12:41 +01:00