diff options
author | Nick Babcock <nbabcock19@hotmail.com> | 2015-07-10 17:25:50 -0400 |
---|---|---|
committer | Nick Babcock <nbabcock19@hotmail.com> | 2015-07-10 17:25:50 -0400 |
commit | a9e5e7256c9fb27126813c9430be1dab5f27f7ba (patch) | |
tree | 488eb7357fd5e781395161b7aa6be5aabea6a8ed /conf.py | |
parent | 49724ee06f038d27ab3d4adbe4ed403692799aa1 (diff) | |
parent | 0bcdf20cc525c1343b796cb8f247ea5213c6557e (diff) | |
download | simplejson-a9e5e7256c9fb27126813c9430be1dab5f27f7ba.tar.gz |
Merge branch 'master' into iterable_as_array-gh1
Conflicts:
CHANGES.txt
conf.py
index.rst
setup.py
simplejson/__init__.py
simplejson/_speedups.c
simplejson/encoder.py
simplejson/tests/test_tuple.py
Diffstat (limited to 'conf.py')
-rw-r--r-- | conf.py | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -36,15 +36,15 @@ master_doc = 'index' # General substitutions. project = 'simplejson' -copyright = '2011, Bob Ippolito' +copyright = '2015, Bob Ippolito' # The default replacements for |version| and |release|, also used in various # other places throughout the built documents. # # The short X.Y version. -version = '2.3' +version = '3.7' # The full version, including alpha/beta/rc tags. -release = '2.3.0' +release = '3.7.4' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: |