6ce48a5b7b
Conflicts: app.js index.html libs/colibri/colibri.focus.js libs/modules/statistics.bundle.js moderator.js modules/UI/videolayout/VideoLayout.js muc.js |
||
---|---|---|
.. | ||
strophe.caps.jsonly.min.js | ||
strophe.disco.min.js | ||
strophe.jingle.adapter.js | ||
strophe.jingle.js | ||
strophe.jingle.sdp.js | ||
strophe.jingle.session.js | ||
strophe.min.js | ||
strophe.util.js |