Merge pull request #2758 from wallabag/fix-public-sharing

[github/wallabag/wallabag.git] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cec7fe5c32bb726a360a9879d766dfcbaa4d8a8..ad9164266a63bad81af3064a935abfb7feee126c 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 ## Changelog
 
-### 2.1.4 2016/11/18
+### 2.1.5 2016/11/21
+- [#2623](https://github.com/wallabag/wallabag/pull/2623) Force composer to run as PHP 5.5.9 (@j0k3r)
+- [#2608](https://github.com/wallabag/wallabag/pull/2608) Change version to 2.2.0-dev (@nicosomb)
+- [#2607](https://github.com/wallabag/wallabag/pull/2607) Updated changelog for 2.1.4 (@nicosomb)
+
+### 2.1.4 2016/11/19
+- [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r)
+- [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r)
+- [#2603](https://github.com/wallabag/wallabag/pull/2603) Fix clear-cache problem using —no-dev (@j0k3r)
+- [#2596](https://github.com/wallabag/wallabag/pull/2596) Prepare wallabag 2.1.4 :rocket: (@nicosomb)
 - [#2550](https://github.com/wallabag/wallabag/pull/2550) Reordered documentation (@jlnostr, @nicosomb)
 - [#2578](https://github.com/wallabag/wallabag/pull/2578) Added help on config screen (@nicosomb)
 - [#2570](https://github.com/wallabag/wallabag/pull/2570) Added creation date on entries view (@nicosomb)