merge

2017-02-02 22:05:44 +00:00 · 2017-02-02 22:05:44 +00:00 · be41462f3a
commit be41462f3a
parent 0a3d9fc17f cd5a1abfac
35 changed files with 621 additions and 275 deletions
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@ -35,7 +35,7 @@ export function onSendMessageFailed(err, room) {
        Modal.createDialog(UnknownDeviceDialog, {
            devices: err.devices,
            room: room,
-        });
+        }, "mx_Dialog_unknownDevice");
    }
    dis.dispatch({
        action: 'message_send_failed',