mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 01:53:41 +01:00
7452a95998
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. |
||
|---|---|---|
| .. | ||
| 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 | ||