diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-21 15:15:30 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-21 15:15:30 +0100 |
| commit | eb2d613c3ed95d741e987917f976da349ea240eb (patch) | |
| tree | 589ebf10ebf557e6fb4d8524f08f13dacfc92ff2 /CHANGELOG.md | |
| parent | a38d50e1e8a6ff509852b2fee8cd94d79aea7919 (diff) | |
| parent | 625bb561813222aea8a7a2e84e30e9f9de697017 (diff) | |
| download | wallabag-eb2d613c3ed95d741e987917f976da349ea240eb.tar.gz wallabag-eb2d613c3ed95d741e987917f976da349ea240eb.tar.zst wallabag-eb2d613c3ed95d741e987917f976da349ea240eb.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index de523f91..ad916426 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | ## Changelog | 1 | ## Changelog |
| 2 | 2 | ||
| 3 | ### 2.1.5 2016/11/21 | ||
| 4 | - [#2623](https://github.com/wallabag/wallabag/pull/2623) Force composer to run as PHP 5.5.9 (@j0k3r) | ||
| 5 | - [#2608](https://github.com/wallabag/wallabag/pull/2608) Change version to 2.2.0-dev (@nicosomb) | ||
| 6 | - [#2607](https://github.com/wallabag/wallabag/pull/2607) Updated changelog for 2.1.4 (@nicosomb) | ||
| 7 | |||
| 3 | ### 2.1.4 2016/11/19 | 8 | ### 2.1.4 2016/11/19 |
| 4 | - [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r) | 9 | - [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r) |
| 5 | - [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r) | 10 | - [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r) |