Commit Graph

5 Commits

Author SHA1 Message Date
hristoterezov 6ce48a5b7b Merge branch 'master' of github.com:jitsi/jitsi-meet
Conflicts:
	app.js
	index.html
	libs/colibri/colibri.focus.js
	libs/modules/statistics.bundle.js
	moderator.js
	modules/UI/videolayout/VideoLayout.js
	muc.js
2015-01-07 17:14:10 +02:00
hristoterezov 69b0e2ad32 Creates UI module. 2015-01-07 16:54:03 +02:00
paweldomas 4fb7001b00 Converts 'constraints' to local variable in order to fix desktop sharing issues(audio constraints were retained in global var and get desktop stream failed). 2015-01-05 13:07:28 +01:00
hristoterezov efc161dacd Fixes issue with obtaining audio/video permissions when simulcast is disabled. 2014-12-23 16:24:56 +02:00
hristoterezov 5b34a66cb6 Implements RTC module. 2014-12-19 15:59:08 +02:00