OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2017-11-15 11:26:05 +00:00
parent 0847596083 96a3eff5d3
commit 072a3cd622
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/views/elements/Flair.js
View File

@ -21,7 +21,6 @@ import PropTypes from 'prop-types';
import {MatrixClient} from 'matrix-js-sdk'; import {MatrixClient} from 'matrix-js-sdk';
import FlairStore from '../../../stores/FlairStore'; import FlairStore from '../../../stores/FlairStore';
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import SettingsStore from "../../../settings/SettingsStore";
class FlairAvatar extends React.Component { class FlairAvatar extends React.Component {

2
src/settings/handlers/AccountSettingsHandler.js
View File

@ -34,7 +34,7 @@ export default class AccountSettingHandler extends SettingsHandler {
if (preferredValue === null || preferredValue === undefined) { if (preferredValue === null || preferredValue === undefined) {
// Honour the old setting on read only // Honour the old setting on read only
if (settingName === "hideAvatarChanges" || settingName === "hideDisplaynameChanges") { if (settingName === "hideAvatarChanges" || settingName === "hideDisplaynameChanges") {
preferredValue = this._getSettings()["hideAvatarDisplaynameChanges"] preferredValue = this._getSettings()["hideAvatarDisplaynameChanges"];
} }
} }