aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-01-31 11:31:45 +0100
committerGitHub <noreply@github.com>2017-01-31 11:31:45 +0100
commit713f35bafd15a46f6a861a4c447504d7466371da (patch)
treea50d0c1d08deb10c8fac31831d048196d7404c49
parent38c73f9691b27624d9f5f3f410ab233aa86cf1ea (diff)
parent4021c928be1a12b050ee4ca946f7399e884a9e4a (diff)
downloadwallabag-713f35bafd15a46f6a861a4c447504d7466371da.tar.gz
wallabag-713f35bafd15a46f6a861a4c447504d7466371da.tar.zst
wallabag-713f35bafd15a46f6a861a4c447504d7466371da.zip
Merge pull request #2812 from wallabag/prepare-221
Prepare wallabag 2.2.1 :rocket:
-rw-r--r--CHANGELOG.md4
-rw-r--r--app/config/config.yml2
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 @@
1## Changelog 1## Changelog
2 2
3### 2.2.1 2017/01/31
4
5- [#2809](https://github.com/wallabag/wallabag/pull/2809) Fixed duplicate entry for share_public in craue_setting_table and added documentation about migration (@nicosomb)
6
3### 2.2.0 2017/01/27 7### 2.2.0 2017/01/27
4- [#2789](https://github.com/wallabag/wallabag/pull/2789) Added indexes on is_archived and is_starred (@nicosomb) 8- [#2789](https://github.com/wallabag/wallabag/pull/2789) Added indexes on is_archived and is_starred (@nicosomb)
5- [#2763](https://github.com/wallabag/wallabag/pull/2763) Sort list of available tags (@janLo) 9- [#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:
30 assets: ~ 30 assets: ~
31 31
32wallabag_core: 32wallabag_core:
33 version: 2.2.0 33 version: 2.2.1
34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
35 languages: 35 languages:
36 en: 'English' 36 en: 'English'