mirror of
https://github.com/vector-im/element-web.git
synced 2025-10-02 19:11:42 +02:00
Merge branch 'develop' into kegan/controller-merging4
This commit is contained in:
commit
8a98fcd427
@ -34,6 +34,12 @@ var sdk = require('../../../index');
|
|||||||
module.exports = React.createClass({
|
module.exports = React.createClass({
|
||||||
displayName: 'MemberInfo',
|
displayName: 'MemberInfo',
|
||||||
|
|
||||||
|
getDefaultProps: function() {
|
||||||
|
return {
|
||||||
|
onFinished: function() {}
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
componentDidMount: function() {
|
componentDidMount: function() {
|
||||||
// work out the current state
|
// work out the current state
|
||||||
if (this.props.member) {
|
if (this.props.member) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user