mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 10:18:45 +09:00
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. |
||
---|---|---|
.. | ||
account_batch.rb | ||
admin_settings.rb | ||
challenge.rb | ||
custom_emoji_batch.rb | ||
delete_confirmation.rb | ||
domain_block_batch.rb | ||
email_domain_block_batch.rb | ||
ip_block_batch.rb | ||
redirect.rb | ||
status_filter_batch_action.rb | ||
two_factor_confirmation.rb |