From 6f49e7ff23b169266aacfd94fba2cc357b8e6cc8 Mon Sep 17 00:00:00 2001
From: thespad <spad@linuxserver.io>
Date: Mon, 26 Aug 2024 22:50:04 +0100
Subject: [PATCH] Fix double changelog entry

---
 README.md                                          | 3 +--
 readme-vars.yml                                    | 3 +--
 root/defaults/nginx/site-confs/default.conf.sample | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7593cfa..9da1ba6 100644
--- a/README.md
+++ b/README.md
@@ -428,8 +428,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **26.08.24:** - Rebase to Alpine 3.20. Existing users should update: their nginx confs to avoid http2 deprecation warnings.
-* **08.08.24:** - Rebase to Alpine 3.19, Enable [Active Record Encryption](https://github.com/mastodon/mastodon/pull/29831/files).
+* **26.08.24:** - Rebase to Alpine 3.20, enable [Active Record Encryption](https://github.com/mastodon/mastodon/pull/29831/files). Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **21.09.23:** - Rebase to Alpine 3.18, migrate to s6v3.
 * **25.05.23:** - Adjust apk flags.
 * **09.02.23:** - Add Glitch branch.
diff --git a/readme-vars.yml b/readme-vars.yml
index e671341..7d87646 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -118,8 +118,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "26.08.24:", desc: "Rebase to Alpine 3.20. Existing users should update: their nginx confs to avoid http2 deprecation warnings." }
-  - { date: "08.08.24:", desc: "Rebase to Alpine 3.19, Enable [Active Record Encryption](https://github.com/mastodon/mastodon/pull/29831/files)." }
+  - { date: "26.08.24:", desc: "Rebase to Alpine 3.20, enable [Active Record Encryption](https://github.com/mastodon/mastodon/pull/29831/files). Existing users should update their nginx confs to avoid http2 deprecation warnings." }
   - { date: "21.09.23:", desc: "Rebase to Alpine 3.18, migrate to s6v3." }
   - { date: "25.05.23:", desc: "Adjust apk flags." }
   - { date: "09.02.23:", desc: "Add Glitch branch." }
diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index 4e275eb..4a58758 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,4 +1,4 @@
-## Version 2024/05/27 - Changelog: https://github.com/linuxserver/docker-mastodon/commits/main/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/08/26 - Changelog: https://github.com/linuxserver/docker-mastodon/commits/main/root/defaults/nginx/site-confs/default.conf.sample
 
 map $http_upgrade $connection_upgrade {
     default upgrade;