Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.
jdecked/twemoji
@/
Rails/I18nLocaleTexts
repo:changelog
Rails/WhereExists