Merge branch 'develop' into improvement.change-language

# Conflicts: # app/views/LanguageView/index.js
RocketChat · Feb 11, 2020 · 90ceda6 · 90ceda6
2 parents 9438e57 + ebe36cd
commit 90ceda6
Show file tree

Hide file tree

Showing 98 changed files with 11,900 additions and 8,037 deletions.
diff --git a/__mocks__/@rocket.chat/ui-kit.js b/__mocks__/@rocket.chat/ui-kit.js
@@ -0,0 +1,11 @@
+export default {
+	window: () => null
+};
+
+export const uiKitMessage = () => () => null;
+
+export const uiKitModal = () => () => null;
+
+export class UiKitParserMessage {}
+
+export class UiKitParserModal {}