Merge remote-tracking branch 'upstream/v0.9' into latest

Signed-off-by: VirtualTam <virtualtam@flibidi.net>

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b018cb48cfca3795cfbb83d057d5d8a264892da..2f557f6f74629f78633e5561c3542f5d789e3287 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,6 +132,22 @@ Theming:
 ### Security
 - Markdown plugin: escape HTML entities by default
 
+## [v0.8.4](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4) - 2017-03-04
+### Security
+- Markdown plugin: escape HTML entities by default
+
+
+## [v0.8.3](https://github.com/shaarli/Shaarli/releases/tag/v0.8.3) - 2017-01-20
+
+### Fixed
+
+- PHP 7.1 compatibility: add ConfigManager parameter to anti-bruteforce function call in login template.
+
+## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15
+
+### Fixed
+
+- Editing a link created before the new ID system would change its permalink.
 
 ## [v0.8.4](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4) - 2017-03-04
 ### Security