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

This commit is contained in:
Jorik Schellekens 2020-05-20 13:46:17 +01:00
commit 6d9d4ee547
473 changed files with 5407 additions and 1434 deletions

View file

@ -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) {