Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps

2021-03-09 09:33:19 -07:00 · 2021-03-09 09:33:19 -07:00 · 5b3367d44e
commit 5b3367d44e
parent 41576954fd eb45731d2e
24 changed files with 73 additions and 65 deletions
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@ -118,7 +118,7 @@ export default class RoomSettingsDialog extends React.Component {
        return (
            <BaseDialog className='mx_RoomSettingsDialog' hasCancel={true}
                        onFinished={this.props.onFinished} title={_t("Room Settings - %(roomName)s", {roomName})}>
-                <div className='ms_SettingsDialog_content'>
+                <div className='mx_SettingsDialog_content'>
                    <TabbedView tabs={this._getTabs()} />
                </div>
            </BaseDialog>