mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-15 19:33:32 +00:00
b735954971
Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc. |
||
---|---|---|
.. | ||
account_batch.rb | ||
admin_settings.rb | ||
challenge.rb | ||
custom_emoji_batch.rb | ||
delete_confirmation.rb | ||
domain_block_batch.rb | ||
email_domain_block_batch.rb | ||
import.rb | ||
ip_block_batch.rb | ||
redirect.rb | ||
status_filter_batch_action.rb | ||
two_factor_confirmation.rb |