mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-28 07:57:45 +00:00
392ca0472a
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| 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 | ||