David Baker c58eb0d5a3 Merge branch 'turn' into develop

2014-09-25 13:09:56 +01:00

..

event-handler-service.js

getUserDisplayName: Disambiguate users who have the same displayname in the room.

2014-09-25 11:45:01 +02:00

event-stream-service.js

…

matrix-call.js

Add stun server fallback and I-told-you-so message if we get no TURN server and the connection fails.

2014-09-25 11:14:29 +01:00

matrix-filter.js

SYWEB-27: Public rooms with 2 users must not considered as 1:1 chat room and so, they must no be renamed

2014-09-24 13:17:47 +02:00

matrix-phone-service.js

…

matrix-service.js

Merge branch 'turn' into develop

2014-09-25 13:09:56 +01:00

presence-service.js

…