Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux

2017-01-24 20:47:24 +00:00 · 2017-01-24 20:47:24 +00:00 · 6dd46d532a
commit 6dd46d532a
parent b323551f22 55591f2019
124 changed files with 1837 additions and 654 deletions
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@ -71,7 +71,7 @@ module.exports = React.createClass({
    getDefaultProps: function() {
        return {
            leftOffset: 0,
-        }
+        };
    },

    getInitialState: function() {
@ -81,7 +81,7 @@ module.exports = React.createClass({
        // position.
        return {
            suppressDisplay: !this.props.suppressAnimation,
-        }
+        };
    },

    componentWillUnmount: function() {