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 | ||
| filters_spec.rb | ||
| instance_spec.rb | ||
| media_spec.rb | ||
| search_spec.rb | ||
| suggestions_spec.rb | ||