Merge branch 'jo-webrtc-adapter-update' into development

# Conflicts: # bower.json # package.json # publish/adapter.debug.js # publish/adapter.min.js # publish/adapter.screenshare.js # publish/adapter.screenshare.min.js
Temasys · Sep 5, 2018 · 0379b9a · 0379b9a
2 parents 6e33b11 + d79d23b
commit 0379b9a
Show file tree

Hide file tree

Showing 7 changed files with 3,207 additions and 1,283 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "adapterjs",
     "description": "Creating a common API for WebRTC in the browser",
-    "version": "0.15.2",
+    "version": "0.15.3",
     "homepage": "https://temasys.github.io/",
     "author": {
         "name": "Temasys Communications Pte. Ltd.",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "adapterjs",
   "description": "Creating a common API for WebRTC in the browser",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "homepage": "https://temasys.github.io/",
   "author": {
     "name": "Temasys Communications Pte. Ltd.",
@@ -55,7 +55,7 @@
     "karma-script-launcher": "0.1.0",
     "mocha": "2.1.0",
     "requirejs": "^2.1.19",
-    "webrtc-adapter": "5.0.6"
+    "webrtc-adapter": "6.3.2"
   },
   "testling": {
     "files": "tmp/*.js",