From 58b35b56ff8cef86f1a2be46d1415f2ebde3224b Mon Sep 17 00:00:00 2001
From: Yaroslav Nurkov <78199449+AnywayFarus@users.noreply.github.com>
Date: Fri, 3 May 2024 18:59:22 +0300
Subject: [PATCH] Automatic changelog for PR #3147 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-3147.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-3147.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3147.yml b/html/changelogs/AutoChangeLog-pr-3147.yml
new file mode 100644
index 00000000000..b19efb8134b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3147.yml
@@ -0,0 +1,7 @@
+author: "Melbert"
+delete-after: True
+changes:
+  - admin: "Custom Single and Custom Multi votes are now combined into one vote"
+  - admin: "Admins can now end votes instantly, rather than cancelling them"
+  - admin: "Admins can now reset the vote cooldown"
+  - bugfix: "Vote cooldown actually applies now"
\ No newline at end of file