summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt8
-rw-r--r--setup.py2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 9ed8504..24def2e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,14 @@
+1.2.0 (2019-01-15)
+------------------
+
+No changes since the last beta release. Enjoy Waitress!
+
1.2.0b3 (2019-01-07)
--------------------
+Bugfixes
+~~~~~~~~
+
- Modified ``clear_untrusted_proxy_headers`` to be usable without a
``trusted_proxy``.
https://github.com/Pylons/waitress/pull/228
diff --git a/setup.py b/setup.py
index 4144e82..577b745 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ testing_extras = [
setup(
name='waitress',
- version='1.2.0b3',
+ version='1.2.0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
maintainer="Pylons Project",