diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2018-01-22 11:10:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 11:10:12 +0100 |
| commit | f24e9bfab0f5d8b1bbac11e3ba731bd81157ee51 (patch) | |
| tree | 9732bd1d34490473f4354e76fc14f088a55c3625 | |
| parent | fd637b9a5af28d432f775297ff19ba3f779d55b2 (diff) | |
| parent | ac1811f83eb403525cfa33ae98c8bad5795984b7 (diff) | |
| download | wallabag-f24e9bfab0f5d8b1bbac11e3ba731bd81157ee51.tar.gz wallabag-f24e9bfab0f5d8b1bbac11e3ba731bd81157ee51.tar.zst wallabag-f24e9bfab0f5d8b1bbac11e3ba731bd81157ee51.zip | |
Merge pull request #3568 from wallabag/prepare-2.3.2
Prepare 2.3.2 release
| -rw-r--r-- | CHANGELOG.md | 13 | ||||
| -rw-r--r-- | app/config/wallabag.yml | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a9cab26..b2626153 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -1,5 +1,18 @@ | |||
| 1 | # Changelog | 1 | # Changelog |
| 2 | 2 | ||
| 3 | ## [2.3.2](https://github.com/wallabag/wallabag/tree/2.3.2) | ||
| 4 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.1...2.3.2) | ||
| 5 | |||
| 6 | ### Fixes | ||
| 7 | |||
| 8 | - Add `set -eu` to update.sh [#3546](https://github.com/wallabag/wallabag/pull/3546) | ||
| 9 | - Fix broken link to remove tags from entries [#3536](https://github.com/wallabag/wallabag/pull/3536) | ||
| 10 | |||
| 11 | ### Changes | ||
| 12 | |||
| 13 | - Nav actions updated [#3541](https://github.com/wallabag/wallabag/pull/3541) | ||
| 14 | - Replaced Create new client link with a button [#3539](https://github.com/wallabag/wallabag/pull/3539) | ||
| 15 | |||
| 3 | ## [2.3.1](https://github.com/wallabag/wallabag/tree/2.3.1) | 16 | ## [2.3.1](https://github.com/wallabag/wallabag/tree/2.3.1) |
| 4 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.0...2.3.1) | 17 | [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.0...2.3.1) |
| 5 | 18 | ||
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 71faccd7..b155d159 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | wallabag_core: | 1 | wallabag_core: |
| 2 | version: 2.3.1 | 2 | version: 2.3.2 |
| 3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
| 4 | languages: | 4 | languages: |
| 5 | en: 'English' | 5 | en: 'English' |