[DRE-commits] [ruby-adsf] 04/15: Merge tag 'upstream/1.2.1'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-adsf.

commit dbde856d7181a8241b6b67cdfb62d98cc5745a51
Merge: ffcb089 76ba113
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jun 3 22:04:43 2016 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    # gpg: Signature faite le ven. 03 juin 2016 22:04:42 CEST
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 .travis.yml                         |  15 ++++++
 Gemfile.lock                        |  24 ---------
 adsf.gemspec                        |  51 ++++++++-----------
 sample/index.html                   |   7 +++
 sample/test.png                     | Bin 0 -> 161197 bytes
 test/helper.rb                      |  44 ++++++++++++++++
 test/rack/test_index_file_finder.rb |  99 ++++++++++++++++++++++++++++++++++++
 7 files changed, 186 insertions(+), 54 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-adsf.git