Merge upstream changes - Githubissues

polyamspace / mastodon

Custom Mastodon fork used by https://polyam.space

GNU Affero General Public License v3.0

1 stars 2 forks source link

Closed polyamAdmin closed 1 month ago

polyamAdmin commented 1 month ago

:warning: Bumps ruby to 3.3.4

Conflicts:

config/locales/simple_form.en.yml Upstream added a string close to one modified to say "toot". Added new string.

Ported changes: