[DRE-commits] [ruby-rails-assets-diaspora-jsxc] 01/03: Merge tag 'upstream/0.1.1_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 2a54e4c5e43fb8f9dc6bb23c000953e5d8d6a186
Merge: 862204d 30f2b8c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Apr 2 19:58:59 2015 +0530

    Merge tag 'upstream/0.1.1_dfsg'
    
    Upstream version 0.1.1~dfsg
    
    # gpg: Signature made Thursday 02 April 2015 07:58:44 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>"

 README.md                                          |    7 +-
 .../javascripts/diaspora_jsxc/lib/strophe.caps.js  |    8 +-
 app/assets/stylesheets/diaspora_jsxc.scss          |    4 +-
 .../stylesheets/diaspora_jsxc/build/css/jsxc.scss  | 1062 ++++++++++++++++
 .../diaspora_jsxc/build/css/jsxc.webrtc.scss       |  239 ++++
 .../stylesheets/diaspora_jsxc/build/jsxc.scss      | 1289 --------------------
 .../diaspora_jsxc/build/jsxc.webrtc.scss           |  379 ------
 .../diaspora_jsxc/lib/jquery.colorbox.scss         |    2 +-
 .../stylesheets/diaspora_jsxc/scss/_buddylist.scss |  148 +++
 .../stylesheets/diaspora_jsxc/scss/_colors.scss    |  115 ++
 .../stylesheets/diaspora_jsxc/scss/_jsxc.scss      |  721 +++++++++++
 .../stylesheets/diaspora_jsxc/scss/_modules.scss   |   28 +
 .../stylesheets/diaspora_jsxc/scss/_roster.scss    |  161 +++
 .../stylesheets/diaspora_jsxc/scss/_state.scss     |   25 +
 .../stylesheets/diaspora_jsxc/scss/_webrtc.scss    |  245 ++++
 .../stylesheets/diaspora_jsxc/scss/emoticons.scss  |   72 ++
 lib/rails-assets-diaspora_jsxc.rb                  |   12 +-
 lib/rails-assets-diaspora_jsxc/version.rb          |    2 +-
 metadata.yml                                       |   40 +-
 rails-assets-diaspora_jsxc.gemspec                 |    4 +-
 20 files changed, 2862 insertions(+), 1701 deletions(-)

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