From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 11 Jan 2019 13:16:41 +0000 (+0100)
Subject: Prepare 2.3.6 release
X-Git-Tag: 2.3.6~1^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3bed2e440ee4d548036221129c15427d055519ea;p=github%2Fwallabag%2Fwallabag.git

Prepare 2.3.6 release
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52988f85..c116efb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.3.6](https://github.com/wallabag/wallabag/tree/2.3.6)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.5...2.3.6)
+
+### Fixes
+
+- Jump to 2.3.6-dev and update release process [#3814](https://github.com/wallabag/wallabag/pull/3814)
+- Fix tag API leak [#3823](https://github.com/wallabag/wallabag/pull/3823)
+- Validate imported entry to avoid error on import [#3816](https://github.com/wallabag/wallabag/pull/3816)
+- Fix incorrect reading time calculation for entries with CJK characters [#3820](https://github.com/wallabag/wallabag/pull/3820)
+- EntriesExport/epub: replace epub identifier with unique urn [#3827](https://github.com/wallabag/wallabag/pull/3827)
+- Fix settings field inverted [#3833](https://github.com/wallabag/wallabag/pull/3833)
+- Cast client id to avoid PG error [#3831](https://github.com/wallabag/wallabag/pull/3831)
+- Rework of EPUB/PDF exports [#3826](https://github.com/wallabag/wallabag/pull/3826)
+
 ## [2.3.5](https://github.com/wallabag/wallabag/tree/2.3.5)
    [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.4...2.3.5)
 
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index d9a3d5dc..1b49a1eb 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -1,5 +1,5 @@
 wallabag_core:
-    version: 2.3.6-dev
+    version: 2.3.6
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'