Not the painful change I was expecting to deal with...
Conflicts:
app/javascript/flavours/glitch/components/status.jsx
Upstream removed some props, polyam-glitch had extra one for alt-modal.
Removed props upstream removed.
app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
Upstream refactor conflicted with code highlighting feature.
Moved code highlighting to EmbeddedStatusContent.
app/javascript/mastodon/locales/en.json
Upstream added new strings close to ones modified to say "toot".
Added new strings and kept "toot".
config/locales/en-GB.yml
Upstream added new string close to one modified to say "toot".
Added new string.
config/locales/en.yml
Same as above.
config/locales/simple_form.en-GB.yml
Same as above.
Ported changes:
a609940ec9a370a18789ad87532a098fe6e564c9
7224e2405413b816b2fbc171a9a9e7b86bae0261 (This still needs a lot of additional work)
:warning: Includes DB migrations
Not the painful change I was expecting to deal with...
Conflicts:
app/javascript/flavours/glitch/components/status.jsxUpstream removed some props, polyam-glitch had extra one for alt-modal. Removed props upstream removed.app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsxUpstream refactor conflicted with code highlighting feature. Moved code highlighting to EmbeddedStatusContent.app/javascript/mastodon/locales/en.jsonUpstream added new strings close to ones modified to say "toot". Added new strings and kept "toot".config/locales/en-GB.ymlUpstream added new string close to one modified to say "toot". Added new string.config/locales/en.ymlSame as above.config/locales/simple_form.en-GB.ymlSame as above.Ported changes:
Additional changes: