Merge tag 'v0.10.0' into latest

Release v0.10.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04cb2fd1ba4d85013a813599c822564ec31096c2..18907c187e2f298edbae5acf71ef54d8810b8ee9 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,7 +60,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Security
 - Update `.htaccess` to prevent accessing Git metadata when using a Git-based installation
 
-
 ## [v0.9.7](https://github.com/shaarli/Shaarli/releases/tag/v0.9.7) - 2018-06-20
 ### Changed
 - Build the Docker images from the local Git sources
@@ -280,6 +279,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.7](https://github.com/shaarli/Shaarli/releases/tag/v0.8.7) - 2018-06-20
 ### Changed

diff --git a/Dockerfile b/Dockerfile
index d8921cee4cae2820a1448635f6ad1dab6425fe0b..10de129e82367aed684d14c224160536c19b6093 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,11 @@ FROM python:3-alpine as docs
 ADD . /usr/src/app/shaarli
 RUN cd /usr/src/app/shaarli \
     && pip install --no-cache-dir mkdocs \
+<<<<<<< HEAD
+    && mkdocs build
+=======
     && mkdocs build --clean
+>>>>>>> v0.10.0
 
 # Stage 2:
 # - Resolve PHP dependencies with Composer