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

2017-10-15 00:19:14 +00:00 · 2017-10-15 00:19:14 +00:00 · 69881c4455
parent 2f9e3104de 635996c083
commit 69881c4455
1 changed files with 2 additions and 2 deletions
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@ -97,5 +97,5 @@ module.exports = React.createClass({
                </div>
            </div>
        );
-    }
+    },
 });