Merge branch 'develop' into kegan/controller-merging4

2015-11-30 14:14:41 +00:00 · 2015-11-30 14:14:41 +00:00 · 8a98fcd427
parent fcb6db684b 2002af6c7d
commit 8a98fcd427
1 changed files with 6 additions and 0 deletions
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@ -34,6 +34,12 @@ var sdk = require('../../../index');
 module.exports = React.createClass({
    displayName: 'MemberInfo',

+    getDefaultProps: function() {
+        return {
+            onFinished: function() {}
+        };
+    },
+
    componentDidMount: function() {
        // work out the current state
        if (this.props.member) {