mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-23 16:44:04 -05:00
b28ce2424c
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did. |
||
---|---|---|
.. | ||
access_tokens_vacuum.rb | ||
backups_vacuum.rb | ||
feeds_vacuum.rb | ||
imports_vacuum.rb | ||
media_attachments_vacuum.rb | ||
preview_cards_vacuum.rb | ||
statuses_vacuum.rb |