Merge remote-tracking branch 'origin/t3chguy/fix/24962' into t3chguy/… · matrix-org/matrix-react-sdk@24b4773 · GitHub

This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Merge remote-tracking branch 'origin/t3chguy/fix/24962' into t3chguy/…

Browse files

…fix/24962

# Conflicts:
#	src/components/views/elements/Slider.tsx
#	test/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap

Loading branch information

t3chguy committed Mar 30, 2023

2 parents 411df0c + d2852ed commit 24b4773