Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		2021-02-12 10:28:32 +01:00
..
admin
settings
accounts_helper.rb
application_helper.rb
domain_control_helper.rb
flashes_helper.rb
home_helper.rb
instance_helper.rb
jsonld_helper.rb
mascot_helper.rb
routing_helper.rb
settings_helper.rb
statuses_helper.rb
webfinger_helper.rb