From aa067c666d477242c26e91cc69c9cd67652d8b8d Mon Sep 17 00:00:00 2001
From: Matthew Planchard <msplanchard@gmail.com>
Date: Tue, 31 Oct 2017 14:17:29 -0500
Subject: [PATCH] Updated changelog

---
 CHANGES.rst | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1da0859..ce29902 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,13 +1,29 @@
 Changelog
 =========
 
-X.X.X (2016-06-25)
+1.3.0 (2017-XX-XX)
 ------------------
 
+- Matrix-based authorization, allowing users to have multiple actions
+  (thanks @khornberg, #132)
+
+- FIX propagation of certain ``pypiserver`` settings via a ``paste.ini`` config
+  file (thanks @luismsgomes, #156)
+
+- FIX update default fallback URL to be https for compliance with PyPI
+  (thanks @uSpike, #182)
+
+- FIX resolved a regression preventing spinning up multiple pypiservers
+  via a paste config (thanks @bertjwregeer, #173)
+
 - FIX cmdline parsing of stray comparison consuming many flags (e.g. ``--help``),
   and docs about ``auther``
   - (thanks to @sakurai-youhei, #162).
 
+- Travis CI testing for Python 3.6 and pypy3 (#183)
+
+- Several documentation improvements (thanks @tescalada, #166, #161, #172)
+
 1.2.0 (2016-06-25)
 ------------------
 "Brexit": Normalize and stop legacy support.