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

This commit is contained in:
Erik Johnston committed 2014-08-19 16:41:13 +01:00
commit e2b861cc67
7 files changed
+100 -8

No files matched your search

@@ -68,9 +68,7 @@ angular.module('matrixService', [])
params: params,
data: data,
headers: headers
})
return deferred.promise;
});
};