mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 12:45:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Weblate 2018-04-09 15:57:39 +00:00
commit 09e94e07ae
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/GroupView.js
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;