app/lib/admin/metrics/dimension/software_versions_dimension.rb
Upstream fixed an issue which was fixed differently for polyam-glitch.
Matched upstreams fix.
app/javascript/mastodon/locales/en.json
Upstream added new strings close to modified ones.
Added new strings and replaced "post" with "toot"
Ported Changes:
14bc73e94cb40b10404468bb6bda75af2c9995a6 (Needs some more work for cancel follow request)
:warning: Includes DB migration
Conflicts:
app/lib/admin/metrics/dimension/software_versions_dimension.rb
Upstream fixed an issue which was fixed differently for polyam-glitch. Matched upstreams fix.app/javascript/mastodon/locales/en.json
Upstream added new strings close to modified ones. Added new strings and replaced "post" with "toot"Ported Changes: