diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2017-01-31 11:06:35 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2017-01-31 11:06:35 +0100 |
| commit | 4021c928be1a12b050ee4ca946f7399e884a9e4a (patch) | |
| tree | a50d0c1d08deb10c8fac31831d048196d7404c49 | |
| parent | 38c73f9691b27624d9f5f3f410ab233aa86cf1ea (diff) | |
| download | wallabag-4021c928be1a12b050ee4ca946f7399e884a9e4a.tar.gz wallabag-4021c928be1a12b050ee4ca946f7399e884a9e4a.tar.zst wallabag-4021c928be1a12b050ee4ca946f7399e884a9e4a.zip | |
Prepare wallabag 2.2.1 :rocket:
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/config/config.yml | 2 |
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 | ||
| 32 | wallabag_core: | 32 | wallabag_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' |