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/app/models/trends
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
2022-11-14 08:35: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
tag_batch.rb
tag_filter.rb
tags.rb