mirror of https://github.com/Siphonay/mastodon
dfe851b476
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. |
||
---|---|---|
.. | ||
access_tokens_vacuum.rb | ||
backups_vacuum.rb | ||
feeds_vacuum.rb | ||
imports_vacuum.rb | ||
media_attachments_vacuum.rb | ||
preview_cards_vacuum.rb | ||
statuses_vacuum.rb |