Merge branch 'turn' into develop

This commit is contained in:
David Baker 2014-09-25 13:09:56 +01:00
commit c58eb0d5a3
7 changed files with 165 additions and 6 deletions

View file

@ -767,6 +767,10 @@ angular.module('matrixService', [])
var deferred = $q.defer();
deferred.reject({data:{error: "Invalid room: " + room_id}});
return deferred.promise;
},
getTurnServer: function() {
return doRequest("GET", "/voip/turnServer");
}
};