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

2018-03-12 15:33:08 +00:00 · 2018-03-12 15:33:08 +00:00 · 05cdd8098b
parent 791ef02715 0341b299ae
commit 05cdd8098b
1 changed files with 2 additions and 1 deletions
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@ -82,7 +83,7 @@ module.exports = React.createClass({
        }
    },

-    onClientSync(syncState, prevState) {
+    onClientSync: function(syncState, prevState) {
        if (this.unmounted) return;

        // Consider the client reconnected if there is no error with syncing.