5 files changed, 46 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 652fb63d..9c1581d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -177,7 +177,40 @@ Theming:
 - `composer.lock` is now included in git file to allow proper `composer install`
 - History mechanism which logs link addition/modification/deletion
 
+## [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
+<<<<<<< HEAD
+- 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.**
+
+### Security
+- Fix an XSS (cross-site-scripting) vulnerability in `index.php`
+
+
+## [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
+=======
 - Docker: enable nginx URL rewriting for the REST API
 - Theming:
     - Move `user.css` to the `data` folder
@@ -199,6 +232,7 @@ Theming:
 - Partial namespace support for Shaarli classes
 - Shaarli version is now only present in `shaarli_version.php`
 - Human readable maximum file size upload
+>>>>>>> v0.9.7
 
 
 ### Removed
@@ -239,9 +273,12 @@ Theming:
 ### Fixed
 - PHP 7.1 compatibility: add ConfigManager parameter to anti-bruteforce function call in login template.
 
+<<<<<<< HEAD
+=======
 ## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15
 ### Fixed
 
+>>>>>>> v0.9.7
 - Editing a link created before the new ID system would change its permalink.
 
 ## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - 2016-12-12
diff --git a/Makefile b/Makefile
index d659d908..0ae03226 100644
--- a/Makefile
+++ b/Makefile
@@ -203,7 +203,6 @@ htmldoc:
         find doc/html/ -type f -exec chmod a-x '{}' \;
         rm -r venv
 
-
 ### Generate Shaarli's translation compiled file (.mo)
 translate:
-        @find inc/languages/ -name shaarli.po -execdir msgfmt shaarli.po -o shaarli.mo \;
\ No newline at end of file
+        @find inc/languages/ -name shaarli.po -execdir msgfmt shaarli.po -o shaarli.mo \;
diff --git a/application/Updater.php b/application/Updater.php
index 8d2bd577..034b8ed8 100644
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -246,6 +246,8 @@ class Updater
     }
 
     /**
+<<<<<<< HEAD
+=======
      * Rename tags starting with a '-' to work with tag exclusion search.
      */
     public function updateMethodRenameDashTags()
diff --git a/index.php b/index.php
index 2de9be0a..e05055c3 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,12 @@
 <?php
 /**
+<<<<<<< HEAD
+ * Shaarli v0.8.7 - Shaare your links...
+ *
+ * The personal, minimalist, super-fast, database free, bookmarking service.
+=======
  * Shaarli - The personal, minimalist, super-fast, database free, bookmarking service.
+>>>>>>> v0.9.7
  *
  * Friendly fork by the Shaarli community:
  *  - https://github.com/shaarli/Shaarli
diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php
index fed175df..77578528 100644
--- a/tests/Updater/UpdaterTest.php
+++ b/tests/Updater/UpdaterTest.php
@@ -489,7 +489,6 @@ $GLOBALS[\'privateLinkByDefault\'] = true;';
         $this->assertFalse($this->conf->get('security.markdown_escape'));
     }
 
-
     /**
      * Test updateMethodEscapeMarkdown with markdown plugin disabled
      * => setting markdown_escape set to true.