jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2499 from hackebrot/update-license-dates 

Update copyright dates in LICENSE, README.rst and in the documentation
This commit is contained in:
Raphael Pierzina 2017-06-13 17:18:08 +02:00 committed by GitHub
parent 6fa7b16482 0e73724e58
commit 0908f40e43
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,6 +1,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2004-2016 Holger Krekel and others Copyright (c) 2004-2017 Holger Krekel and others
Permission is hereby granted, free of charge, to any person obtaining a copy of 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 this software and associated documentation files (the "Software"), to deal in

2
README.rst
View File

@ -102,7 +102,7 @@ Consult the `Changelog <http://docs.pytest.org/en/latest/changelog.html>`__ page
License License
------- -------
Copyright Holger Krekel and others, 2004-2016. Copyright Holger Krekel and others, 2004-2017.
Distributed under the terms of the `MIT`_ license, pytest is free and open source software. Distributed under the terms of the `MIT`_ license, pytest is free and open source software.

1
changelog/2499.trivial Normal file
View File

@ -0,0 +1 @@
Update copyright dates in LICENSE, README.rst and in the documentation.

4
doc/en/index.rst
View File

@ -83,8 +83,8 @@ Consult the :ref:`Changelog <changelog>` page for fixes and enhancements of each
License License
------- -------
Copyright Holger Krekel and others, 2004-2016. Copyright Holger Krekel and others, 2004-2017.
Distributed under the terms of the `MIT`_ license, pytest is free and open source software. Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE .. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE

2
doc/en/license.rst
View File

@ -9,7 +9,7 @@ Distributed under the terms of the `MIT`_ license, pytest is free and open sourc
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2004-2016 Holger Krekel and others Copyright (c) 2004-2017 Holger Krekel and others
Permission is hereby granted, free of charge, to any person obtaining a copy of 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 this software and associated documentation files (the "Software"), to deal in