From 985d00778366c09a2182c84de5c16e06fbab6f10 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Mon, 20 Jun 2022 22:12:28 -0700
Subject: [PATCH] Version 1.14.2

---
 CHANGELOG             | 5 +++++
 CloudronManifest.json | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e89bfe7..4fd4ea6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -221,3 +221,8 @@
 * [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.36.1)
 * [BUGFIX] promtool: Add --lint-fatal option #10840
 
+[1.14.2]
+* Update Prometheus to 2.36.2
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.36.2)
+* [BUGFIX] Fix serving of static assets like fonts and favicon. #10888
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index c588826..8e83a96 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -1,6 +1,6 @@
 {
-  "version": "1.14.1",
-  "upstreamVersion": "2.36.1",
+  "version": "1.14.2",
+  "upstreamVersion": "2.36.2",
   "id": "io.prometheus.cloudronapp",
   "title": "Prometheus Server",
   "author": "Erik Tadevosyan",