016d194274
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests. |
||
---|---|---|
.. | ||
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 |