[Pkg-voip-commits] [janus] 116/282: Merge branch 'master' into fix-iceloop-quit

[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 3cc6a4f321601dbd0296d204b12c2571d0900794
Merge: 6aae7e3 9bc69c1
Author: Alessandro Toppi <atoppi at meetecho.com>
Date:   Fri Sep 29 16:52:38 2017 +0200

    Merge branch 'master' into fix-iceloop-quit

 html/janus.js                 |  351 +++---
 html/janus.nojquery.js        | 2491 -----------------------------------------
 ice.c                         |    4 +-
 janus.c                       |   22 +-
 mainpage.dox                  |  143 ++-
 transports/janus_websockets.c |   43 +-
 6 files changed, 373 insertions(+), 2681 deletions(-)


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