From a7ba3ce67d2c446219fa8665155ff5e8865e4c2d Mon Sep 17 00:00:00 2001
From: buckket <buckket@cock.li>
Date: Fri, 12 Feb 2016 18:44:02 +0100
Subject: [PATCH] This is 1.2.0

---
 AUTHORS  |  4 ++++
 CHANGES  | 13 +++++++++++++
 setup.py |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 25eaa50..e1e283f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,9 +4,13 @@ buckket <buckket@cock.li>
 
 Contributors
 ------------
+DracoBlue <JanS@DracoBlue.de>
+Jan Schütze <jan.schuetze@exozet.com>
+Jeremy Kitchen <kitchen@kitchen.io>
 Matthew Brady <brady.matthew@gmail.com>
 Melvin Carvalho <melvincarvalho@gmail.com>
 tedder <ted@timmons.me>
+teddydestodes <derkomtur@schattengang.net>
 Ted Timmons <ted@perljam.net>
 Timo Furrer <tuxtimo@gmail.com>
 Weland Treebark <weland@blinkenshell.org>
diff --git a/CHANGES b/CHANGES
index 83c224a..32c8567 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,19 @@ Changelog
 
 These are all the changes in twtxt since the first public release.
 
+1.2.0
+-----
+
+- twtxt package is now executable
+- twtxt is now available as wheel archive
+- Check status of feed before following a new source
+- Added a source option to timeline command to only show one specific source
+- Added a view command which is basically an alias for the source option
+- Added support for local caching of remote twtxt files
+- Added support for mentions, see README.rst for more information
+- Added a pre_tweet_hook option, works like post_tweet_hook
+- Added a porcelain option, styles output script-friendly
+
 1.1.0
 -----
 
diff --git a/setup.py b/setup.py
index 2bca1ac..5250b4a 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name='twtxt',
-    version='1.1.0',
+    version='1.2.0',
 
     url='https://github.com/buckket/twtxt',