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

This commit is contained in:
Weblate 2018-10-02 19:27:36 +00:00
commit 9484141a87

View file

@ -109,7 +109,7 @@ class MatrixClientPeg {
await promise; await promise;
} catch (err) { } catch (err) {
// log any errors when starting up the database (if one exists) // log any errors when starting up the database (if one exists)
console.error(`Error starting matrixclient store: ${err}`); console.error('Error starting matrixclient store', err);
} }
// regardless of errors, start the client. If we did error out, we'll // regardless of errors, start the client. If we did error out, we'll