Merge branch 'release/1.1.3'

testing/mmn/mktime_takes_localtime_not_gmtime
Isis Lovecruft 2013-07-02 10:14:44 +00:00
commit c837b73e25
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
2 changed files with 6 additions and 1 deletions

View File

@ -1,2 +1,7 @@
[upload_docs] [upload_docs]
upload-dir = docs/_build/html upload-dir = docs/_build/html
[upload]
sign = True
identity = 0xa3adb67a2cdb8b35

View File

@ -38,7 +38,7 @@ import os
import setuptools import setuptools
import versioneer import versioneer
versioneer.versionfile_source = 'src/_version.py' versioneer.versionfile_source = 'gnupg/_version.py'
versioneer.versionfile_build = 'gnupg/_version.py' versioneer.versionfile_build = 'gnupg/_version.py'
versioneer.tag_prefix = '' versioneer.tag_prefix = ''
versioneer.parentdir_prefix = 'gnupg-' versioneer.parentdir_prefix = 'gnupg-'