ab2f0daa10
Conflicts: - `.github/workflows/build-security.yml`: Changes were already cherry-picked and adapted in glitch-soc. Kept glitch-soc's version. - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `lib/mastodon/version.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. |
||
|---|---|---|
| .. | ||
| admin | ||
| accounts_helper.rb | ||
| application_helper.rb | ||
| 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 | ||