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

Update copyright dates in LICENSE, README.rst and in the documentation
pytest-dev · Jun 13, 2017 · 0908f40 · 0908f40
2 parents 6fa7b16 + 0e73724
commit 0908f40
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 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
 this software and associated documentation files (the "Software"), to deal in

diff --git a/README.rst b/README.rst
@@ -102,7 +102,7 @@ Consult the `Changelog <http://docs.pytest.org/en/latest/changelog.html>`__ page
 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.
 

diff --git a/changelog/2499.trivial b/changelog/2499.trivial
@@ -0,0 +1 @@
+Update copyright dates in LICENSE, README.rst and in the documentation.
diff --git a/doc/en/index.rst b/doc/en/index.rst
@@ -83,8 +83,8 @@ Consult the :ref:`Changelog <changelog>` page for fixes and enhancements of each
 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.
 
-.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE
+.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE
diff --git a/doc/en/license.rst b/doc/en/license.rst
@@ -9,7 +9,7 @@ Distributed under the terms of the `MIT`_ license, pytest is free and open sourc
 
     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
     this software and associated documentation files (the "Software"), to deal in
-Original file line number
+Diff line change
@@ Expand Up @@
     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.
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Update copyright dates in LICENSE, README.rst and in the documentation.