aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-01-01 15:11:24 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-01-01 15:11:24 -0600
commit4dcc0fe3f908892c08d7ba3dcb0aa85226a8da94 (patch)
treefe4f65b951f62d1302bee1d0fe67c66325abd5e6
parentb5804e02d72c1f80a6db494979c1b9533516b462 (diff)
parent9d361291369784d951a7051f6ba6d0a2680156b9 (diff)
downloadcryptography-4dcc0fe3f908892c08d7ba3dcb0aa85226a8da94.tar.gz
cryptography-4dcc0fe3f908892c08d7ba3dcb0aa85226a8da94.tar.bz2
cryptography-4dcc0fe3f908892c08d7ba3dcb0aa85226a8da94.zip
Merge pull request #2624 from alex/2016
Bump the copyright year
-rw-r--r--docs/conf.py2
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 5a4c41b1..dcc9c626 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -71,7 +71,7 @@ master_doc = 'index'
# General information about the project.
project = 'Cryptography'
-copyright = '2013-2015, Individual Contributors'
+copyright = '2013-2016, Individual Contributors'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index fbc1e735..f25cbc89 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -20,4 +20,4 @@ __author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
__license__ = "BSD or Apache License, Version 2.0"
-__copyright__ = "Copyright 2013-2015 {0}".format(__author__)
+__copyright__ = "Copyright 2013-2016 {0}".format(__author__)
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 63f0b572..11bd69fb 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -20,4 +20,4 @@ __author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
__license__ = "BSD or Apache License, Version 2.0"
-__copyright__ = "Copyright 2013-2015 %s" % __author__
+__copyright__ = "Copyright 2013-2016 %s" % __author__