jiti-meet/modules
hristoterezov f4acf97b00 Merge branch 'master' of github.com:jitsi/jitsi-meet
Conflicts:
	app.js
	libs/strophe/strophe.jingle.js
	modules/xmpp/moderator.js
	muc.js
2015-01-19 12:00:30 +02:00
..
API Creates initial version of xmpp module. 2015-01-19 11:20:00 +02:00
RTC Creates initial version of xmpp module. 2015-01-19 11:20:00 +02:00
UI Creates initial version of xmpp module. 2015-01-19 11:20:00 +02:00
connectionquality Creates initial version of xmpp module. 2015-01-19 11:20:00 +02:00
desktopsharing Creates initial version of xmpp module. 2015-01-19 11:20:00 +02:00
simulcast Creates initial version of xmpp module. 2015-01-19 11:20:00 +02:00
statistics Creates initial version of xmpp module. 2015-01-19 11:20:00 +02:00
xmpp Merge branch 'master' of github.com:jitsi/jitsi-meet 2015-01-19 12:00:30 +02:00