[Pkg-voip-commits] [janus] 42/282: Merge branch 'master' into nosip

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.

commit 60a0949fb242dc5dab2f98939f78b66e0c574759
Merge: f610519 3dc0e95
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue May 23 15:24:19 2017 +0200

    Merge branch 'master' into nosip

 html/audiobridgetest.html   | 2 +-
 html/devicetest.html        | 2 +-
 html/echotest.html          | 2 +-
 html/janus.js               | 8 ++++----
 html/janus.nojquery.js      | 8 ++++----
 html/recordplaytest.html    | 2 +-
 html/screensharingtest.html | 2 +-
 html/siptest.html           | 2 +-
 html/streamingtest.html     | 2 +-
 html/textroomtest.html      | 2 +-
 html/videocalltest.html     | 2 +-
 html/videoroomtest.html     | 2 +-
 html/voicemailtest.html     | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git