From 70de1eecb359b1acd46b6aab2518d6a013cb12f0 Mon Sep 17 00:00:00 2001
From: Lorenz Diener <lorenz.diener@uni-bremen.de>
Date: Mon, 29 Jan 2018 15:10:28 +0100
Subject: [PATCH] Prepare release 1.2.2

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

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 22e7c24..f4fa6a7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@ 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.2
+------
+* Several small bugfixes (thanks codl)
+* Mastodon v2.1.2 compatibility
+    * Added instance_activity()
+    * Added instance_peers()    
+* Fixed StreamListener breaking when listening to more than one stream (again thanks, codl)
+    * POTENTIALLY BREAKING CHANGE: Remvoved handle_line, which should have been an internal helper to begin with
+
 v1.2.1 
 ------
 * Internal stability changes and fixes to streaming code
diff --git a/docs/conf.py b/docs/conf.py
index d4b0e26..6653fea 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.1'
+release = u'1.2.2'
 
 # 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 c49f534..40e5428 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ extras = {
 }
 
 setup(name='Mastodon.py',
-      version='1.2.1',
+      version='1.2.2',
       description='Python wrapper for the Mastodon API',
       packages=['mastodon'],
       setup_requires=['pytest-runner'],