[DRE-commits] [ruby-rails-assets-diaspora-jsxc] 02/06: Merge tag 'upstream/0.1.4+dfsg'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-rails-assets-diaspora-jsxc.

commit c97b61960fe6b2e559e4099f4c94786243e2af62
Merge: acbb8c1 073d9a1
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jun 29 22:38:42 2016 +0530

    Merge tag 'upstream/0.1.4+dfsg'
    
    Upstream version 0.1.4+dfsg
    
    # gpg: Signature made Wednesday 29 June 2016 10:38:37 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 app/assets/javascripts/diaspora_jsxc/jsxc.js       |   869 +-
 .../javascripts/diaspora_jsxc/lib/jsxc.dep.js      | 14058 ++++++++++---------
 .../javascripts/diaspora_jsxc/lib/strophe.caps.js  |    15 +-
 .../strophe.jinglejs/strophe.jinglejs-bundle.js    | 13545 ++++++++++--------
 .../javascripts/diaspora_jsxc/lib/translation.js   |     2 +-
 app/assets/stylesheets/diaspora_jsxc/jsxc.scss     |  4920 ++++---
 .../stylesheets/diaspora_jsxc/jsxc.webrtc.scss     |    97 +-
 lib/rails-assets-diaspora_jsxc.rb                  |     4 +-
 lib/rails-assets-diaspora_jsxc/version.rb          |     2 +-
 metadata.yml                                       |    48 +-
 rails-assets-diaspora_jsxc.gemspec                 |    12 +-
 11 files changed, 18750 insertions(+), 14822 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rails-assets-diaspora-jsxc.git