NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bump puma from 5.1.1 to 5.3.1

Browse source 
Bumps [puma](https://github.com/puma/puma) from 5.1.1 to 5.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.1.1...v5.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot] 2021-05-18 01:37:02 +00:00 committed by Eric Schultz
parent 363d6f5697
commit df8fed22d3
3 changed files with 180 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile Executable file → Normal file
View file

@ -8,7 +8,7 @@ gem 'jbuilder', '~> 2.10'
gem 'bootsnap', '~> 1.4', require: false # Large rails application booting enhancer gem 'bootsnap', '~> 1.4', require: false # Large rails application booting enhancer
gem 'font_assets', '~> 0.1.14' # for serving fonts on cdn https://github.com/ericallam/font_assets gem 'font_assets', '~> 0.1.14' # for serving fonts on cdn https://github.com/ericallam/font_assets
gem 'hamster', '~> 3.0' # Thread-safe collection classes for Ruby gem 'hamster', '~> 3.0' # Thread-safe collection classes for Ruby
gem 'puma', '~> 5.0' gem 'puma', '~> 5.3'
gem 'rake', '~> 12.3.2' gem 'rake', '~> 12.3.2'
gem 'sassc-rails', '~> 2.1', '>= 2.1.2' gem 'sassc-rails', '~> 2.1', '>= 2.1.2'
gem 'sassc', '~> 2.0', '>= 2.0.1' gem 'sassc', '~> 2.0', '>= 2.0.1'

4
Gemfile.lock
View file

@ -239,7 +239,7 @@ GEM
byebug (~> 11.0) byebug (~> 11.0)
pry (~> 0.10) pry (~> 0.10)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.1.1) puma (5.3.1)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.5.2) racc (1.5.2)
rack (2.2.3) rack (2.2.3)
@ -448,7 +448,7 @@ DEPENDENCIES
pg (~> 1.1) pg (~> 1.1)
pry (~> 0.12.2) pry (~> 0.12.2)
pry-byebug (~> 3.7.0) pry-byebug (~> 3.7.0)
puma (~> 5.0) puma (~> 5.3)
qx! qx!
rack-attack (~> 5.2) rack-attack (~> 5.2)
rack-ssl (~> 1.4) rack-ssl (~> 1.4)

253
NOTICE-ruby
View file

@ -551,7 +551,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
------ ------
** puma; version 5.1.1 -- ** puma; version 5.3.1 --
Zed Shaw, (c) 2005. Zed Shaw, (c) 2005.
copyright Evan Phoenix copyright Evan Phoenix
Copyright (c) 2005 Zed A. Shaw Copyright (c) 2005 Zed A. Shaw
@ -1080,6 +1080,37 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------
** actionmailer; version 6.1.3.2 --
** actionview; version 6.1.3.2 --
** activemodel; version 6.1.3.2 --
** railties; version 6.1.3.2 --
Copyright (c) 2006-2013 Paul Battley, Michael Neumann, Tim Fletcher.
Copyright (c) 2004-2020 David Heinemeier Hansson
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------ ------
** rb-fsevent; version 0.10.4 -- ** rb-fsevent; version 0.10.4 --
@ -1467,7 +1498,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------ ------
** mini_portile2; version 2.5.0 -- ** mini_portile2; version 2.5.1 --
Copyright (c) 2011-2016 Luis Lavena and Mike Dalessio Copyright (c) 2011-2016 Luis Lavena and Mike Dalessio
Copyright (c) 2011-2016 Luis Lavena and Mike Dalessio Copyright (c) 2011-2016 Luis Lavena and Mike Dalessio
@ -1679,6 +1710,33 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------
** actioncable; version 6.1.3.2 --
Copyright (c) 2010-2015 James Coglan
Copyright (c) 2015-2020 Basecamp, LLC
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------ ------
** money; version 6.13.8 -- ** money; version 6.13.8 --
@ -1712,7 +1770,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------ ------
** loofah; version 2.9.0 -- ** loofah; version 2.9.1 --
Copyright (c) 2006-2008 The Authors Copyright (c) 2006-2008 The Authors
Copyright (c) 2009 2018 by Mike Dalessio, Bryan Helmkamp Copyright (c) 2009 2018 by Mike Dalessio, Bryan Helmkamp
@ -2290,6 +2348,33 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------
** actiontext; version 6.1.3.2 --
MIT License
Copyright (c) 2020 Basecamp, LLC
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
------ ------
** netrc; version 0.11.0 -- ** netrc; version 0.11.0 --
@ -2317,32 +2402,6 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------
** nokogiri; version 1.11.2 --
(c) Copyright 2002-2005, Andy Clark.
Copyright (c) 1998-2003 Daniel Veillard.
Copyright (c) 1998-2012 Daniel Veillard.
Copyright (c) 2001-2002 Daniel Veillard.
copyrighted by the Free Software Foundation
Copyright (c) 1991 Free Software Foundation, Inc.
Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
Copyright (c) 2001-2003 Thai Open Source Software Center Ltd
Copyright (c) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard.
Copyright (c) 2001-2002, SourceForge ISO-RELAX Project (ASAMI Tomoharu, Daisuke Okajima, Kohsuke Kawaguchi, and MURATA Makoto)
Copyright 2008 2020 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.
The MIT License
Copyright 2008 -- 2020 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------ ------
** rspec-core; version 3.9.3 -- ** rspec-core; version 3.9.3 --
@ -2525,6 +2584,33 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------
** activejob; version 6.1.3.2 --
Copyright (c) 2014-2020 David Heinemeier Hansson
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------ ------
** parallel; version 1.20.1 -- ** parallel; version 1.20.1 --
@ -2638,7 +2724,7 @@ SOFTWARE.
------ ------
** i18n; version 1.8.9 -- ** i18n; version 1.8.10 --
Copyright (c) 2003-2009 Masao Mutoh Copyright (c) 2003-2009 Masao Mutoh
Copyright (c) 2008 The Ruby I18n team Copyright (c) 2008 The Ruby I18n team
Copyright (c) 2005-2019 David Heinemeier Hansson Copyright (c) 2005-2019 David Heinemeier Hansson
@ -2749,17 +2835,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------ ------
** actioncable; version 6.1.3.1 -- ** actionmailbox; version 6.1.3.2 --
Copyright (c) 2010-2015 James Coglan ** actionpack; version 6.1.3.2 --
** actionmailbox; version 6.1.3.1 -- ** activerecord; version 6.1.3.2 --
** actionmailer; version 6.1.3.1 -- ** activestorage; version 6.1.3.2 --
** actionpack; version 6.1.3.1 -- ** activesupport; version 6.1.3.2 --
** actiontext; version 6.1.3.1 --
** actionview; version 6.1.3.1 --
** activejob; version 6.1.3.1 --
** activemodel; version 6.1.3.1 --
** activerecord; version 6.1.3.1 --
** activesupport; version 6.1.3.1 --
** coderay; version 1.1.3 -- ** coderay; version 1.1.3 --
Copyright (c) 2005-2012 Kornelius Kalnbach <murphy@rubychan.de> Copyright (c) 2005-2012 Kornelius Kalnbach <murphy@rubychan.de>
** crack; version 0.4.5 -- ** crack; version 0.4.5 --
@ -2791,12 +2871,11 @@ Copyright (c) Django Software Foundation and individual contributors.
Copyright (c) 2007-2019 Leah Neukirchen <http://leahneukirchen.org/infopage.html> Copyright (c) 2007-2019 Leah Neukirchen <http://leahneukirchen.org/infopage.html>
** rack-attack; version 5.4.2 -- ** rack-attack; version 5.4.2 --
Copyright Kickstarter, PBC. Copyright Kickstarter, PBC.
** rails; version 6.1.3.1 -- ** rails; version 6.1.3.2 --
** rails-dom-testing; version 2.0.3 -- ** rails-dom-testing; version 2.0.3 --
Copyright (c) 2013-2015 Kasper Timm Hansen Copyright (c) 2013-2015 Kasper Timm Hansen
** rails-html-sanitizer; version 1.3.0 -- ** rails-html-sanitizer; version 1.3.0 --
Copyright (c) 2013-2015 Rafael Mendonca Franca, Kasper Timm Hansen Copyright (c) 2013-2015 Rafael Mendonca Franca, Kasper Timm Hansen
** railties; version 6.1.3.1 --
** wisper; version 2.0.1 -- ** wisper; version 2.0.1 --
Copyright (c) 2013 Kris Leech Copyright (c) 2013 Kris Leech
@ -2810,6 +2889,33 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------
** nokogiri; version 1.11.3 --
(c) Copyright 2002-2005, Andy Clark.
Copyright (c) 1998-2003 Daniel Veillard.
Copyright (c) 1998-2012 Daniel Veillard.
Copyright (c) 2001-2002 Daniel Veillard.
copyrighted by the Free Software Foundation
Copyright (c) 1991 Free Software Foundation, Inc.
Copyright 1992-2018 Free Software Foundation, Inc.
Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
Copyright (c) 2001-2003 Thai Open Source Software Center Ltd
Copyright (c) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard.
Copyright (c) 2001-2002, SourceForge ISO-RELAX Project (ASAMI Tomoharu, Daisuke Okajima, Kohsuke Kawaguchi, and MURATA Makoto)
Copyright 2008 2021 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.
The MIT License
Copyright 2008 -- 2021 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------ ------
** roadie; version 4.0.0 -- ** roadie; version 4.0.0 --
@ -3172,32 +3278,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
------
** activestorage; version 6.1.3.1 --
Copyright (c) 2017-2020 David Heinemeier Hansson, Basecamp
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------ ------
** fast_blank; version 1.0.0 -- ** fast_blank; version 1.0.0 --
@ -4426,6 +4506,34 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------
** marcel; version 1.0.1 --
Copyright (c) 2017 Tom Ward
Copyright (c) 2011 Daniel Mendler.
Copyright (c) 2017 Tom Ward
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------ ------
** diff-lcs; version 1.4.4 -- ** diff-lcs; version 1.4.4 --
@ -4473,10 +4581,3 @@ See the file docs/artistic.txt in the main distribution.
=== GNU GPL version 2 === GNU GPL version 2
See the file docs/COPYING.txt in the main distribution. See the file docs/COPYING.txt in the main distribution.
------
** marcel; version 1.0.0 --
MIT OR Apache-2.0