mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
b3bf32a21e
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system. |
||
|---|---|---|
| .. | ||
| account_batch.rb | ||
| admin_settings.rb | ||
| challenge.rb | ||
| custom_emoji_batch.rb | ||
| delete_confirmation.rb | ||
| ip_block_batch.rb | ||
| preview_card_batch.rb | ||
| preview_card_provider_batch.rb | ||
| redirect.rb | ||
| tag_batch.rb | ||
| two_factor_confirmation.rb | ||