Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

2020-05-20 13:46:17 +01:00
parent 55e72dd5bf b96c1ada8a
commit 6d9d4ee547
473 changed files with 5407 additions and 1434 deletions
--- a/src/settings/controllers/CustomStatusController.js
+++ b/src/settings/controllers/CustomStatusController.js
@@ -15,7 +15,7 @@ limitations under the License.
 */

 import SettingController from "./SettingController";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";

 export default class CustomStatusController extends SettingController {
    onChange(level, roomId, newValue) {