[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00
parent 6ca9a7c998 d40091afc5
commit fde32f13a5
190 changed files with 6185 additions and 2225 deletions
--- a/src/components/views/dialogs/KeyShareDialog.js
+++ b/src/components/views/dialogs/KeyShareDialog.js
@@ -99,7 +99,7 @@ export default createReactClass({
                    this.props.onFinished(true);
                }
            },
-        });
+        }, null, /* priority = */ false, /* static = */ true);
    },

    _onShareClicked: function() {