Merge remote-tracking branch 'upstream/master' into chatterino7

SevenTV · Jan 5, 2025 · 003cd96 · 003cd96
2 parents 4bd433b + f53d92c
commit 003cd96
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unversioned
 
+## 2.5.2
+
 - Bugfix: Fixed a crash in the 7TV EventApi when closing Chatterino. (#5768)
 - Bugfix: Fixed scrollbar highlights being visible in overlay windows. (#5769)
 - Bugfix: Make macos fonts look the same as v2.5.1. (#5775)

diff --git a/resources/com.chatterino.chatterino.appdata.xml b/resources/com.chatterino.chatterino.appdata.xml
@@ -34,6 +34,9 @@
         <binary>chatterino</binary>
     </provides>
     <releases>
+        <release version="7.5.2" date="2025-01-05">
+            <url>https://github.com/SevenTV/chatterino7/releases/tag/v7.5.2</url>
+        </release>
         <release version="7.5.2~beta1" date="2024-12-14">
             <url>https://github.com/SevenTV/chatterino7/releases/tag/v7.5.2-beta.1</url>
         </release>

diff --git a/src/common/Version.hpp b/src/common/Version.hpp
@@ -25,7 +25,7 @@ namespace chatterino {
  *  - 2.4.0-alpha.2
  *  - 2.4.0-alpha
  **/
-inline const QString CHATTERINO_VERSION = QStringLiteral("7.5.2-beta.1");
+inline const QString CHATTERINO_VERSION = QStringLiteral("7.5.2");
 
 class Version
 {