Commit Graph

3 Commits

Author SHA1 Message Date
hristoterezov 6347730dc7 Fixes some issues related to xmpp module creation. 2015-01-19 18:54:41 +02:00
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
hristoterezov e4e66a03d7 Creates initial version of xmpp module. 2015-01-19 11:20:00 +02:00