[Pkg-voip-commits] [janus] 114/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 079cc48f801153059ef8ab0f1d6b1885b96d5539
Merge: 81a9707 9bc69c1
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Sep 28 17:39:33 2017 +0200

    Merge branch 'master' into nosip

 html/janus.js          |  351 ++++---
 html/janus.nojquery.js | 2491 ------------------------------------------------
 mainpage.dox           |  143 ++-
 3 files changed, 340 insertions(+), 2645 deletions(-)

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