mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-20 06:33:05 -05:00
2aac73341a
Conflicts: - `app/services/backup_service.rb`: Conflict due to glitch-soc's local-only posts. Ported upstream's changes while keeping glitch-soc's feature.