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

This commit is contained in:
Weblate 2018-10-05 12:25:31 +00:00
commit 218da8a18a

View File

@ -60,6 +60,10 @@ import CallHandler from 'matrix-react-sdk/lib/CallHandler';
import {getVectorConfig} from './getconfig'; 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; let lastLocationHashSet = null;
function initRageshake() { function initRageshake() {