]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 928a605 96af587)
Merge pull request #1553 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:feature...
authorChristopher Rienzo <chris@signalwire.com>
Tue, 28 Aug 2018 14:16:50 +0000 (14:16 +0000)
committerChristopher Rienzo <chris@signalwire.com>
Tue, 28 Aug 2018 14:16:50 +0000 (14:16 +0000)
* commit '96af587bf325ce35459cbd82e2e79bda0133a810':
  FS-11287: Provide option for user managed streams in Verto

1  2 
html5/verto/js/src/jquery.FSRTC.js patch | diff1 | diff2 | blob | history
html5/verto/js/src/jquery.verto.js patch | diff1 | diff2 | blob | history

diff --cc html5/verto/js/src/jquery.FSRTC.js
Simple merge
diff --cc html5/verto/js/src/jquery.verto.js
Simple merge
Mirror of https://github.com/signalwire/freeswitch.git