mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-20 00:50:04 +00:00
b2526316f5
Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for 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 | ||
| status_batch.rb | ||
| tag_batch.rb | ||
| two_factor_confirmation.rb | ||