Merge branch 'develop' into johannes/find-myself

2023-02-13 20:16:04 +01:00
parent 985d9983a3 da7aa4055e
commit d0e9331f07
612 changed files with 3608 additions and 2769 deletions
--- a/src/components/views/location/LocationPicker.tsx
+++ b/src/components/views/location/LocationPicker.tsx
@@ -207,7 +207,7 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
        this.props.onFinished();
    };

-    public render(): JSX.Element {
+    public render(): React.ReactNode {
        if (this.state.error) {
            return (
                <div className="mx_LocationPicker mx_LocationPicker_hasError">