1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-13 08:02:38 +03:00

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

This commit is contained in:
Weblate
2018-05-24 10:29:34 +00:00

View File

@@ -270,7 +270,7 @@ module.exports = React.createClass({
// console.log("comparing " + this.memberString(memberA) + " and " + this.memberString(memberB)); // console.log("comparing " + this.memberString(memberA) + " and " + this.memberString(memberB));
if (userA.currentlyActive && userB.currentlyActive) { if ((userA.currentlyActive && userB.currentlyActive) || !this._showPresence) {
// console.log(memberA.name + " and " + memberB.name + " are both active"); // console.log(memberA.name + " and " + memberB.name + " are both active");
if (memberA.powerLevel === memberB.powerLevel) { if (memberA.powerLevel === memberB.powerLevel) {
// console.log(memberA + " and " + memberB + " have same power level"); // console.log(memberA + " and " + memberB + " have same power level");