Merge branch 'develop' into t3chguy/fix_upload_abort

src/@types/global.d.ts

@@ -16,10 +16,12 @@ limitations under the License.
 
 import * as ModernizrStatic from "modernizr";
 import ContentMessages from "../ContentMessages";
+import { IMatrixClientPeg } from "../MatrixClientPeg";
 
 declare global {
     interface Window {
         Modernizr: ModernizrStatic;
+        mxMatrixClientPeg: IMatrixClientPeg;
         Olm: {
             init: () => Promise<void>;
         };