Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream

Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.
This commit is contained in:
Claire committed 2025-12-15 20:22:20 +01:00
commit 1fdb48c668
65 files changed
+958 -344

No files matched your search

@@ -399,9 +399,10 @@ export const LanguageDropdown: React.FC = () => {
}
return (
<div ref={targetRef}>
<>
<button
type='button'
ref={targetRef}
title={intl.formatMessage(messages.changeLanguage)}
aria-expanded={open}
onClick={handleToggle}
@@ -438,6 +439,6 @@ export const LanguageDropdown: React.FC = () => {
</div>
)}
</Overlay>
</div>
</>
);
};