Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		2020-12-15 14:27:06 +01:00
..
account_batch.rb	…
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
challenge.rb	…
custom_emoji_batch.rb	…
delete_confirmation.rb	…
ip_block_batch.rb	…
redirect.rb	…
status_batch.rb	…
tag_batch.rb	…
two_factor_confirmation.rb	…