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
..
admin.js	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
auth.js
common.js
embed.js
mailer.js
public.js
settings.js
theme.yml
two_factor_authentication.js