Merge branch 'master' into qa

* master:
  bump dev version number after big merge
This commit is contained in:
Noah Levitt 2017-11-30 16:16:07 -08:00
commit 69085f1777

View File

@ -52,7 +52,7 @@ except:
setuptools.setup(
name='warcprox',
version='2.2.1b2.dev123',
version='2.2.1b3.dev124',
description='WARC writing MITM HTTP/S proxy',
url='https://github.com/internetarchive/warcprox',
author='Noah Levitt',