1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00

Merge branch 'develop' into travis/remove-presence

This commit is contained in:
Travis Ralston
2018-04-11 15:17:28 -06:00
246 changed files with 16884 additions and 4954 deletions

View File

@@ -174,4 +174,4 @@ class MatrixClientPeg {
if (!global.mxMatrixClientPeg) {
global.mxMatrixClientPeg = new MatrixClientPeg();
}
module.exports = global.mxMatrixClientPeg;
export default global.mxMatrixClientPeg;