[DRE-commits] [ruby-twitter-text] 01/03: Merge tag 'upstream/1.14.6+conformance'

[Sruthi Chandran]

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

srud-guest pushed a commit to branch master
in repository ruby-twitter-text.

commit 836715540fe85aae8acadfd1127ae5ab076a5463
Merge: a3f5271 bdd2ffb
Author: Sruthi Chandran <srud at disroot.org>
Date:   Tue Jun 27 17:19:22 2017 +0530

    Merge tag 'upstream/1.14.6+conformance'
    
    Upstream version 1.14.6+conformance
    
    # gpg: Signature made Tue 27 Jun 2017 05:19:21 PM IST
    # gpg:                using RSA key B1C94F67189FFAC02648FBF3D4DEB22FC0B96E15
    # gpg: Good signature from "Sruthi Chandran <srud at openmailbox.org>" [unknown]
    # gpg:                 aka "Srud <angelsrud at gmail.com>" [unknown]
    # gpg:                 aka "Srud <srud at openmailbox.org>" [unknown]
    # gpg:                 aka "Sruthi Chandran <srud at disroot.org>" [unknown]
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: F889 1B55 2BAD DE5D 0936  8B47 C9B0 AC74 C72B 5836
    #      Subkey fingerprint: B1C9 4F67 189F FAC0 2648  FBF3 D4DE B22F C0B9 6E15

 lib/assets/tld_lib.yml                      | 162 +++++++
 test/twitter-text-conformance/TldLists.java | 162 +++++++
 test/twitter-text-conformance/extract.yml   |  32 ++
 test/twitter-text-conformance/tld_lib.yml   | 162 +++++++
 test/twitter-text-conformance/tlds.yml      | 648 ++++++++++++++++++++++++++++
 twitter-text.gemspec                        |   4 +-
 6 files changed, 1168 insertions(+), 2 deletions(-)

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