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

This commit is contained in:
David Baker 2018-10-05 14:04:43 +01:00
commit e277d02f83
5 changed files with 23 additions and 9 deletions

View file

@ -62,6 +62,10 @@ import CallHandler from 'matrix-react-sdk/lib/CallHandler';
import {getVectorConfig} from './getconfig';
// Disable warnings for now: we use deprecated bluebird functions
// and need to migrate, but they spam the console with warnings.
Promise.config({warnings: false});
let lastLocationHashSet = null;
function initRageshake() {