hristoterezov 4d25b139cc Fixes some issues caused by the merge.		2015-01-07 17:47:48 +02:00
..
ConnectionIndicator.js	Fixes some issues caused by the merge.	2015-01-07 17:47:48 +02:00
VideoLayout.js	Merge branch 'master' of github.com:jitsi/jitsi-meet	2015-01-07 17:14:10 +02:00