Skip to content

Commit 0908f40

Browse files
authored
Merge pull request #2499 from hackebrot/update-license-dates
Update copyright dates in LICENSE, README.rst and in the documentation
2 parents 6fa7b16 + 0e73724 commit 0908f40

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2004-2016 Holger Krekel and others
3+
Copyright (c) 2004-2017 Holger Krekel and others
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Consult the `Changelog <http://docs.pytest.org/en/latest/changelog.html>`__ page
102102
License
103103
-------
104104

105-
Copyright Holger Krekel and others, 2004-2016.
105+
Copyright Holger Krekel and others, 2004-2017.
106106

107107
Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
108108

changelog/2499.trivial

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update copyright dates in LICENSE, README.rst and in the documentation.

doc/en/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ Consult the :ref:`Changelog <changelog>` page for fixes and enhancements of each
8383
License
8484
-------
8585

86-
Copyright Holger Krekel and others, 2004-2016.
86+
Copyright Holger Krekel and others, 2004-2017.
8787

8888
Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
8989

90-
.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE
90+
.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE

doc/en/license.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Distributed under the terms of the `MIT`_ license, pytest is free and open sourc
99

1010
The MIT License (MIT)
1111

12-
Copyright (c) 2004-2016 Holger Krekel and others
12+
Copyright (c) 2004-2017 Holger Krekel and others
1313

1414
Permission is hereby granted, free of charge, to any person obtaining a copy of
1515
this software and associated documentation files (the "Software"), to deal in

0 commit comments

Comments
 (0)