diff options
| author | Per Andersson <avtobiff@gmail.com> | 2014-01-30 01:25:15 +0100 |
|---|---|---|
| committer | Per Andersson <avtobiff@gmail.com> | 2014-01-30 01:25:15 +0100 |
| commit | c084fbcb2e2f2f167c8d65ca1ecfee406f14c24b (patch) | |
| tree | 6c5ca20a48eb50ea000748abb5374247d6de1888 /docs/conf.py | |
| parent | 973d326d7847161827a8f75b5f589008a83a342d (diff) | |
| parent | 6cff86ce6de27fbd4f9fc07716fb1205b14ffae4 (diff) | |
| download | python-bleach-c084fbcb2e2f2f167c8d65ca1ecfee406f14c24b.tar python-bleach-c084fbcb2e2f2f167c8d65ca1ecfee406f14c24b.tar.gz | |
Merge tag 'upstream/1.4'
Upstream version 1.4
# gpg: Signature made Thu 30 Jan 2014 01:25:12 AM CET using RSA key ID 79F492F8
# gpg: Good signature from "Per Andersson <avtobiff@fripost.org>"
# gpg: aka "Per Andersson <avtobiff@debian.org>"
# gpg: aka "Per Andersson <avtobiff@gmail.com>"
# gpg: aka "Per Andersson <avtobiff@foo.nu>"
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py index a63aedf..96b2fc8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,9 +48,9 @@ copyright = u'2012, James Socol' # built documents. # # The short X.Y version. -version = '1.2' +version = '1.3' # The full version, including alpha/beta/rc tags. -release = '1.2.0' +release = '1.3.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |