You've already forked matrix-react-sdk
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:
@@ -549,7 +549,10 @@ export default React.createClass({
|
|||||||
editing: true,
|
editing: true,
|
||||||
profileForm: Object.assign({}, this.state.summary.profile),
|
profileForm: Object.assign({}, this.state.summary.profile),
|
||||||
joinableForm: {
|
joinableForm: {
|
||||||
policyType: this.state.summary.profile.join_policy,
|
policyType:
|
||||||
|
this.state.summary.profile.is_openly_joinable ?
|
||||||
|
GROUP_JOINPOLICY_OPEN :
|
||||||
|
GROUP_JOINPOLICY_INVITE,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
dis.dispatch({
|
dis.dispatch({
|
||||||
|
|||||||
Reference in New Issue
Block a user