mirror of https://github.com/Siphonay/mastodon
85558a5e18
Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes. |
||
|---|---|---|
| .. | ||
| access_tokens_vacuum.rb | ||
| backups_vacuum.rb | ||
| feeds_vacuum.rb | ||
| media_attachments_vacuum.rb | ||
| preview_cards_vacuum.rb | ||
| statuses_vacuum.rb | ||
| system_keys_vacuum.rb | ||