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.
mastodon/app/helpers
Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
7 years ago
..
admin Add order options to relationship manager UI (#10404) 7 years ago
settings
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
flashes_helper.rb
home_helper.rb Admission-based registrations mode (#10250) 7 years ago
instance_helper.rb
jsonld_helper.rb Fix poll update handler calling method was that was not available (#10246) 7 years ago
routing_helper.rb
settings_helper.rb Add missing locales (bn, ga, hi) (#10295) 7 years ago
stream_entries_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 7 years ago