Merge 6479052c77 into e68f205e04

chore: Specify qtkeychain branch to chatterino-cmake (#5695 )
2024-11-13 19:49:51 +01:00 · 2024-11-05 01:15:44 -08:00 · 2024-11-05 10:13:20 +01:00
2 changed files with 2 additions and 0 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -20,6 +20,7 @@
 [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,6 +119,7 @@
 - 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)
Author	SHA1	Message	Date
pajlada	9c4b543dee	Merge `6479052c77` into `e68f205e04`	2024-11-05 01:15:44 -08:00
Brian	e68f205e04	chore: Specify qtkeychain branch to `chatterino-cmake` (#5695 )	2024-11-05 10:13:20 +01:00