Philipp Hancke 75b8c5b962 Merge branch 'master' into tracking ... Conflicts: index.html		2014-09-12 13:18:54 +02:00
..
colibri.focus.js	Merge branch 'master' into tracking	2014-09-12 13:18:54 +02:00
colibri.session.js	Adds mute and kick functoinality avaialable for the focus of the conference.	2014-05-12 00:41:58 +02:00