haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing missed merge conflict

This commit is contained in:
Robert Smallwood 2015-12-09 12:44:08 -07:00 committed by Robert Smallwood
parent 1f4be1578a
commit ae36f52b66
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.js
View File

@ -38,7 +38,7 @@ function init() {
APP.desktopsharing.init();
APP.RTC.start();
APP.xmpp.start(APP.settings.getJid(), null);
APP.xmpp.start();
APP.statistics.start();
APP.connectionquality.init();
APP.keyboardshortcut.init();