merge

2017-02-02 22:05:44 +00:00
parent 0a3d9fc17f cd5a1abfac
commit be41462f3a
35 changed files with 621 additions and 275 deletions
@@ -34,7 +34,7 @@ module.exports = {
                Modal.createDialog(UnknownDeviceDialog, {
                    devices: err.devices,
                    room: MatrixClientPeg.get().getRoom(event.getRoomId()),
-                });
+                }, "mx_Dialog_unknownDevice");
            }

            dis.dispatch({