From 37e7a53779457d5046df4fe10a358fce45b8ddd8 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 9 May 2018 20:28:38 +0200
Subject: [PATCH] v2.2.0

---
 CHANGELOG.md      |  5 +++++
 ISSUE_TEMPLATE.md | 11 ++++++-----
 manifest.json     |  2 +-
 package.json      |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be270555f8..ac9f1ac50c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v2.2.0
+ - NEW: Map local sync folder to a specific server-side folder
+ - FIX: Performance improvements for Firefox
+ - FIX: Race condition removed that would cause issues because same account would be synced twice in parallel
+
 ## v2.1.0
  - NEW: Allow using an extension key to secure entered credentials
  - FIX: Various fixes for Firefox
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 5e496b03da..df584abbdc 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,20 +1,21 @@
 <!--
 Hello there! Thank you for providing feedback!
 Please answer the below questions to allow for as smooth a process of tackling the issue as possible :)
+(Note: Everything surrounded by arrows, like this text for example, will not be visible.)
 -->
 
 ### Software versions
 <!-- Please provide the versions of the following software products in your set up -->
 
-* Browser: 
-* Nextcloud: 
-* Nextcloud Bookmarks app: 
-* Floccus: 
+* Browser:
+* Nextcloud:
+* Nextcloud Bookmarks app:
+* Floccus:
 
 ### Steps to reproduce
 <!-- What did you do? Be as specific as possible -->
 1. ...
-2. 
+2.
 
 ### Expected outcome
 <!-- What did you think was going to happen or what do you think should have happened? -->
diff --git a/manifest.json b/manifest.json
index 576414f638..70208d6a68 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "floccus",
   "short_name": "floccus",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Sync your bookmarks with nextcloud",
   "icons": {
     "48": "icons/logo.png"
diff --git a/package.json b/package.json
index 90fa3bf471..6a70b384dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Sync your bookmarks with nextcloud",
   "main": "index.js",
   "scripts": {