diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-01 07:27:25 -0800 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-01 07:27:25 -0800 |
| commit | 522487e5a7dd3004747da85c9f6c53fc5dc4de06 (patch) | |
| tree | 3eeedc2660b88b795ff2d8904e459faaf7675680 | |
| parent | 7580acddc654ee5da73a7cd43023e07b6c92673e (diff) | |
| parent | dd1f5c5398a4c38179af70ed258641d720aa7d28 (diff) | |
| download | cryptography-522487e5a7dd3004747da85c9f6c53fc5dc4de06.tar.gz cryptography-522487e5a7dd3004747da85c9f6c53fc5dc4de06.tar.bz2 cryptography-522487e5a7dd3004747da85c9f6c53fc5dc4de06.zip | |
Merge pull request #383 from alex/bump-copyright
Bump the copyright year
| -rw-r--r-- | cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | docs/conf.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cryptography/__about__.py b/cryptography/__about__.py index cd207fcc..46212bff 100644 --- a/cryptography/__about__.py +++ b/cryptography/__about__.py @@ -30,4 +30,4 @@ __author__ = ("Alex Gaynor, Hynek Schlawack, Donald Stufft, " __email__ = "cryptography-dev@python.org" __license__ = "Apache License, Version 2.0" -__copyright__ = "Copyright 2013 %s" % __author__ +__copyright__ = "Copyright 2013-2014 %s" % __author__ diff --git a/docs/conf.py b/docs/conf.py index 5092e4d3..5dbcdab8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -54,7 +54,7 @@ master_doc = 'index' # General information about the project. project = 'Cryptography' -copyright = '2013, Individual Contributors' +copyright = '2013-2014, 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 |