Merge branch 'jitsi-meet-new' of github.com:jitsi/jitsi-meet into jitsi-meet-new

This commit is contained in:
hristoterezov 2016-01-21 13:28:54 -06:00
commit b174f231bf
1 changed files with 2 additions and 2 deletions

View File

@ -21,14 +21,14 @@
"bootstrap": "3.1.1",
"events": "*",
"i18next-client": "1.7.7",
"jquery": "^2.1.1",
"jquery": "~2.1.1",
"jQuery-Impromptu": "git+https://github.com/trentrichardson/jQuery-Impromptu.git#v6.0.0",
"jquery-ui": "^1.10.5",
"jssha": "1.5.0",
"pako": "*",
"retry": "0.6.1",
"sdp-interop": "0.1.11",
"sdp-simulcast": "0.1.3",
"sdp-simulcast": "0.1.4",
"sdp-transform": "1.5.*",
"socket.io-client": "1.3.6",
"strophe": "^1.2.2",