Merge branch 'master' into plone-5.1

plone · Jun 26, 2017 · 5788541 · 5788541
2 parents a7440e2 + 4fd4428
commit 5788541
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,13 @@
 Changelog
 =========
 
-1.0a19 (unreleased)
+1.0.a20 (unreleased)
+--------------------
+
+- Nothing changed yet.
+
+
+1.0a19 (2017-06-25)
 -------------------
 
 - Implement tus.io upload endpoint.

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '1.0a19.dev0'
+version = '1.0.a20.dev0'
 
 long_description = (
     open('README.rst').read() + '\n' +