Merge tag 'v0.10.0' into latest

Release v0.10.0

diff --cc CHANGELOG.md
index b5fd3f2fe967488ce1a73f0a4897c3fb8a2f0942,04cb2fd1ba4d85013a813599c822564ec31096c2..18907c187e2f298edbae5acf71ef54d8810b8ee9
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -4,6 -4,63 +4,62 @@@ All notable changes to this project wil
  The format is based on [Keep a Changelog](http://keepachangelog.com/)
  and this project adheres to [Semantic Versioning](http://semver.org/).
  
 -
+ ## [v0.10.0](https://github.com/shaarli/Shaarli/releases/tag/v0.10.0) - 2018-07-28
+ **PHP 5.5 compatibility has been dropped.** Shaarli now requires at least PHP 5.6.
+ 
+ ### Added
+ - Add a filter to display public links only
+ - Add PHP 7.2 support
+ - Add German translation
+ - Resolve front-end dependencies from NPM
+ - Build front-end bundles with Yarn and Webpack
+ - Lint Javascript code with ESLint
+ - Lint SASS code with SASSLint
+ - Support redirection in cURL download callback
+ - Introduce multi-stage builds for Docker images
+ - Use Travis matrix and stages to run Javascript tests in a dedicated environment
+ - Add tag endpoint in the REST API
+ - Build the documentation in Travis builds
+ - Provide a Docker Compose example 
+ 
+ ### Changed
+ - Use web-thumbnailer to retrieve thumbnails (see #687)
+ - Use a specific page title in all pages
+ - Daily: run hooks before creating the columns
+ - Load theme translations files automatically
+ - Make max download size and timeout configurable
+ - Make Nginx logs accessible as stdout/stderr for Docker images
+ - Update buttons used to toggle link visibility filters
+ - Rewrite Javascript code for ES6 compliance
+ - Refactor IP ban management
+ - Refactor user login management
+ - Refactor server-side session management
+ - Update Doxygen configuration
+ - Update Parsedown
+ - Improve documentation
+ - Docker: build the images from the local sources
+ - Docker: bump alpine version to 3.7
+ - Docker: expose a volume for the thumbnail cache
+ 
+ ### Removed
+ - Drop support for PHP 5.5
+ - Remove vendored front-end libraries
+ - Remove environment specific .gitignore entries
+ 
+ ### Fixed
+ - Ignore the case while checking DOCTYPE during the file import
+ - Fix removal of on=... attributes from html generated from Markdown
+ - httpd: always forward the 'Authorization' header
+ - Ensure user-specific CSS file is loaded
+ - Fix feed permalink rendering when Markdown escaping is enabled
+ - Fix order of tags with the same number of occurrences
+ - Fixed the referrer meta tag in default template
+ - Disable MkDocs' strict mode for ReadTheDocs builds to pass
+ - fix and simplify Dockerfile for armhf
+ 
+ ### 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
@@@ -223,23 -280,20 +279,36 @@@ 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
+ - Build the Docker image from the local Git sources
+ 
+ ### Removed
+ - Disable PHP 5.3 Travis build (unsupported)
+ 
+ 
+ ## [v0.8.6](https://github.com/shaarli/Shaarli/releases/tag/v0.8.6) - 2018-02-19
+ ### Changed
+ - Run version check tests against the 'stable' branch
+ 
+ 
  ## [v0.8.5](https://github.com/shaarli/Shaarli/releases/tag/v0.8.5) - 2018-01-04
  **XSS vulnerability fixed. Please update.**
  

diff --cc Dockerfile
index 93146c524e9422bf0699d14999c5250c8ac3b188,d8921cee4cae2820a1448635f6ad1dab6425fe0b..10de129e82367aed684d14c224160536c19b6093
--- 1/Dockerfile
--- 2/Dockerfile
+++ b/Dockerfile
@@@ -5,7 -5,7 +5,11 @@@ FROM python:3-alpine as doc
  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