Merge branch 'master' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2014-09-12 18:27:44 +01:00
commit c7bcd87f37
4 changed files with 23 additions and 2 deletions

View file

@ -598,6 +598,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
promise.then(
function(response) {
console.log("Request successfully sent");
if (echo) {
// Mark this fake message event with its allocated event_id
// When the true message event will come from the events stream (in handleMessage),