Merge branch 'develop' into travis/remove-presence

2018-04-11 15:17:28 -06:00
parent 99d3045b4f 979452628f
commit fe2cbc584d
246 changed files with 16884 additions and 4954 deletions
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -174,4 +174,4 @@ class MatrixClientPeg {
 if (!global.mxMatrixClientPeg) {
    global.mxMatrixClientPeg = new MatrixClientPeg();
 }
-module.exports = global.mxMatrixClientPeg;
+export default global.mxMatrixClientPeg;