From a3482be355f2cdf20bca688786672c6f5658bf4a Mon Sep 17 00:00:00 2001
From: Felix Brucker <felix@felixbrucker.com>
Date: Sat, 1 Aug 2020 10:47:23 +0200
Subject: [PATCH] Prepare release v1.36.0

---
 CHANGELOG.md      | 9 +++++++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18c4b46d6..8e1fa0fd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+1.36.0 / 2020-08-01
+==================
+
+* Add support for sodium deadlines and netDiff
+* Add support for connecting without a proxy name when using a single proxy
+* Add support for limiting the maximum rotated log files via `logMaxFiles` config option
+* Add support for clickable Foxy-Pool upstream names on the web ui
+* Improve historical stats collection. Requires `walletUrl` (or `url` for solo) and `coin` config option to be set.
+
 1.35.2 / 2020-07-26
 ==================
 
diff --git a/package-lock.json b/package-lock.json
index cccb9b385..569e9e1c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "foxy-proxy",
-  "version": "1.35.2",
+  "version": "1.36.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f38aa64e8..25fdb1882 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "foxy-proxy",
-  "version": "1.35.2",
+  "version": "1.36.0",
   "description": "A Proof of Capacity proxy which supports solo and pool mining upstreams.",
   "keywords": [
     "burst",