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

2017-10-15 00:14:00 +00:00 · 2017-10-15 00:14:00 +00:00 · 2f9e3104de
commit 2f9e3104de
parent 10019fb890 247e32115f
1 changed files with 2 additions and 2 deletions
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@ -85,5 +85,5 @@ module.exports = React.createClass({
                <MessageEvent mxEvent={this.props.mxEvent} className="mx_PinnedEventTile_body" />
            </div>
        );
-    }
+    },
 });