From 7fb37a373a1ab256219f524085c8241bd2925054 Mon Sep 17 00:00:00 2001
From: Lorenz Diener <lorenz.diener@uni-bremen.de>
Date: Thu, 21 Dec 2017 11:07:56 +0100
Subject: Prepare release

---
 CHANGELOG.rst | 5 +++++
 docs/conf.py  | 2 +-
 setup.py      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ee3db52..f99a2cb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,11 @@ A note on versioning: This librarys major version will grow with the APIs
 version number. Breaking changes will be indicated by a change in the minor
 (or major) version number, and will generally be avoided. 
 
+v1.2.1
+------
+* Internal stability changes and fixes to streaming code
+* Fixed async parameter being ignored in two streaming methods
+
 v1.2.0
 ------
 * BREAKING CHANGE: Renamed streaming functions to be more in line with the rest
diff --git a/docs/conf.py b/docs/conf.py
index aa645c8..d4b0e26 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -68,7 +68,7 @@ author = u'Lorenz Diener'
 # The short X.Y version.
 version = u'1.2'
 # The full version, including alpha/beta/rc tags.
-release = u'1.2.0'
+release = u'1.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 3dccfc6..c49f534 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ extras = {
 }
 
 setup(name='Mastodon.py',
-      version='1.2.0',
+      version='1.2.1',
       description='Python wrapper for the Mastodon API',
       packages=['mastodon'],
       setup_requires=['pytest-runner'],
-- 
cgit v1.2.3