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	Add ability to filter audit log in admin UI (#13381)	2020-04-03 13:06:34 +02:00
settings
accounts_helper_spec.rb
application_helper_spec.rb
flashes_helper_spec.rb
home_helper_spec.rb
instance_helper_spec.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	2018-03-04 20:29:49 +01:00
jsonld_helper_spec.rb
routing_helper_spec.rb	Use URI.join even when S3 enabled (#4652)	2017-08-21 12:42:16 +02:00
settings_helper_spec.rb
statuses_helper_spec.rb	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	2020-12-15 12:56:43 +01:00