Merge 6479052c77 into 03cdd98c2e

2024-11-13 19:49:51 +01:00 · 2024-11-04 00:50:24 -08:00
2 changed files with 0 additions and 2 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -20,7 +20,6 @@
 [submodule "lib/qtkeychain"]
 	path = lib/qtkeychain
 	url = https://github.com/Chatterino/qtkeychain
-	branch = chatterino-cmake
 [submodule "lib/websocketpp"]
 	path = lib/websocketpp
 	url = https://github.com/zaphoyd/websocketpp
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -119,7 +119,6 @@
 - Dev: Emojis now use flags instead of a set of strings for capabilities. (#5616)
 - Dev: Move plugins to Sol2. (#5622, #5682)
 - Dev: Clarified our Lua dependency's version. (#5693)
- Dev: Specified qtkeychain dependency version. (#5695)
 - Dev: Refactored static `MessageBuilder` helpers to standalone functions. (#5652)
 - Dev: Decoupled reply parsing from `MessageBuilder`. (#5660, #5668)
 - Dev: Refactored IRC message building. (#5663)