diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-02 10:55:36 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-02 10:55:36 -0800 |
| commit | 5bae063ff2601db15d84920f18bae194bcd3d373 (patch) | |
| tree | b6c39a3f84b434ae26245fcda6abe6c1e4165156 /docs/conf.py | |
| parent | 09aa74635f54ace5480a6d502b0da92651f516b6 (diff) | |
| parent | a6d5d6ec53da5bea0193047c5e535a05442f2dfd (diff) | |
| download | cryptography-5bae063ff2601db15d84920f18bae194bcd3d373.tar.gz cryptography-5bae063ff2601db15d84920f18bae194bcd3d373.tar.bz2 cryptography-5bae063ff2601db15d84920f18bae194bcd3d373.zip | |
Merge branch 'master' into fernet
Conflicts:
docs/index.rst
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |