1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00

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

This commit is contained in:
Weblate
2018-04-09 15:57:39 +00:00

View File

@@ -948,7 +948,7 @@ export default React.createClass({
if ((!group || group.myMembership === 'leave') && if ((!group || group.myMembership === 'leave') &&
this.state.summary && this.state.summary &&
this.state.summary.profile && this.state.summary.profile &&
Boolean(this.state.summary.profile.is_joinable) Boolean(this.state.summary.profile.is_openly_joinable)
) { ) {
membershipButtonText = _t("Join this community"); membershipButtonText = _t("Join this community");
membershipButtonOnClick = this._onJoinClick; membershipButtonOnClick = this._onJoinClick;