[DRE-commits] [ruby-twitter-text] 01/06: Merge tag 'upstream/1.14.0+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 c50bb0843dd5f65067f2ca3636d97c30c935cd40
Merge: 0535430 80ff5aa
Author: Sruthi Chandran <srud at disroot.org>
Date:   Mon Sep 19 14:52:50 2016 +0530

    Merge tag 'upstream/1.14.0+conformance'
    
    Upstream version 1.14.0+conformance

 README.md                                   |  122 +
 README.rdoc                                 |  106 -
 lib/assets/tld_lib.yml                      | 2454 +++++----
 lib/twitter-text/regex.rb                   |   46 +-
 test/conformance_test.rb                    |    4 +
 test/twitter-text-conformance/Rakefile      |   29 +-
 test/twitter-text-conformance/TldLists.java | 2460 +++++----
 test/twitter-text-conformance/extract.yml   |   13 +
 test/twitter-text-conformance/tld_lib.yml   | 2454 +++++----
 test/twitter-text-conformance/tlds.yml      | 7684 ++++++++++++++++-----------
 twitter-text.gemspec                        |    2 +-
 11 files changed, 8885 insertions(+), 6489 deletions(-)

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