From 18bb5a90d5ac4e0facd1db671a1bf4f573c1ae65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 19 Apr 2016 10:01:29 +0200
Subject: [PATCH 1/2] Prepare release 2.0.2

---
 CHANGELOG.md                  | 10 ++++++++++
 README.md                     |  2 +-
 app/config/config.yml         |  2 +-
 docs/en/user/installation.rst |  2 +-
 docs/fr/user/installation.rst |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 910eb5dec..77ea64d69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Fixed
+
+### Removed
+
 ## [2.0.1] - 2016-04-11
 ### Added
 
diff --git a/README.md b/README.md
index 430aba20b..14ace792a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Then you can install wallabag by executing the following commands:
 ```
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.1
+    git checkout 2.0.2
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
     php bin/console server:run --env=prod
diff --git a/app/config/config.yml b/app/config/config.yml
index 3910f27b4..f30689852 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,7 +28,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.0.1
+    version: 2.0.2
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 216a8607e..78038322b 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -50,7 +50,7 @@ To install wallabag itself, you must run these two commands:
 
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.1
+    git checkout 2.0.2
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index 3c647aac0..47c2faa10 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -48,7 +48,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
 
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.1
+    git checkout 2.0.2
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 

From 9f151b469f2ed559a06ff16b206929d80c13cb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 19 Apr 2016 20:25:35 +0200
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77ea64d69..5377d1f1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,27 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [2.0.2] - 2016-04-21
 
 ### Added
 
+- [#1945](https://github.com/wallabag/wallabag/pull/1945) cURL examples in documentation about API (Dirk Deimeke)
+- [#1911](https://github.com/wallabag/wallabag/pull/1911) Add title hover on entry titles (Thomas Citharel)
+
 ### Changed
 
+- [#1944](https://github.com/wallabag/wallabag/pull/1944), [#1953](https://github.com/wallabag/wallabag/pull/1953), [#1954](https://github.com/wallabag/wallabag/pull/1954) Due to branches renaming, update documentation and configuration (maxi62330, Nicolas Lœuillet)
+- [#1942](https://github.com/wallabag/wallabag/pull/1942) Optimize import (Nicolas Lœuillet)
+- [#1935](https://github.com/wallabag/wallabag/pull/1935) Update spanish translation (jami7)
+- [#1929](https://github.com/wallabag/wallabag/pull/1929) Change guid and link in RSS feeds to give original entry URL (Nicolas Lœuillet)
+- [#1918](https://github.com/wallabag/wallabag/pull/1918) Improve pagination when user has lot of entries (Nicolas Lœuillet)
+- [#1916](https://github.com/wallabag/wallabag/pull/1916) Change PHP arrays and move test parameters in a separated file (Jeremy Benoist)
+
 ### Fixed
 
-### Removed
+- [#1957](https://github.com/wallabag/wallabag/pull/1957) Fix translation for `Go to your account` button (Nicolas Lœuillet)
+- [#1925](https://github.com/wallabag/wallabag/pull/1925) Redirect to homepage if refered is null (Nicolas Lœuillet)
+- [#1912](https://github.com/wallabag/wallabag/pull/1912) Fix 500 Internal Server Error -> "Setting piwik_enabled couldn't be found" (Jeremy Benoist)
 
 ## [2.0.1] - 2016-04-11
 ### Added