mastodon/app/models/trends
Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them.
2023-02-19 10:42:55 +01:00
..
base.rb
history.rb
links.rb
preview_card_batch.rb
preview_card_filter.rb
preview_card_provider_batch.rb
preview_card_provider_filter.rb
query.rb
status_batch.rb
status_filter.rb
statuses.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
tag_batch.rb
tag_filter.rb
tags.rb