Merge pull request #2812 from wallabag/prepare-221

Prepare wallabag 2.2.1 :rocket:

2 files changed, 5 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79ca5825..a87f1d82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Changelog
 
+### 2.2.1 2017/01/31
+
+- [#2809](https://github.com/wallabag/wallabag/pull/2809) Fixed duplicate entry for share_public in craue_setting_table and added documentation about migration (@nicosomb)
+
 ### 2.2.0 2017/01/27
 - [#2789](https://github.com/wallabag/wallabag/pull/2789) Added indexes on is_archived and is_starred (@nicosomb)
 - [#2763](https://github.com/wallabag/wallabag/pull/2763) Sort list of available tags (@janLo)
diff --git a/app/config/config.yml b/app/config/config.yml
index e0742106..a69a979d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.2.0
+    version: 2.2.1
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'