[Pkg-voip-commits] [janus] 67/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 6797864433805b08e02782988e711e7feb34534a
Merge: 91aa740 3f11325
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon Jun 12 11:54:38 2017 +0200

    Merge branch 'master' into nosip

 README.md                 |  2 +-
 configure.ac              |  2 +-
 docs/janus-doxygen.cfg    |  2 +-
 html/janus.js             | 20 ++++++++++++++------
 html/janus.nojquery.js    | 20 ++++++++++++++------
 html/screensharingtest.js |  4 ++--
 janus.c                   |  4 ++--
 janus.ggo                 |  1 +
 8 files changed, 36 insertions(+), 19 deletions(-)


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