You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/helpers
Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
5 months ago
..
admin
accounts_helper.rb
application_helper.rb Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream 5 months ago
authorized_fetch_helper.rb
branding_helper.rb
context_helper.rb
database_helper.rb
domain_control_helper.rb
email_helper.rb
filters_helper.rb
flashes_helper.rb
formatting_helper.rb
home_helper.rb
instance_helper.rb
invites_helper.rb
jsonld_helper.rb
languages_helper.rb
mascot_helper.rb
media_component_helper.rb
react_component_helper.rb
registration_helper.rb
routing_helper.rb
self_destruct_helper.rb
settings_helper.rb
statuses_helper.rb
webfinger_helper.rb