Merge branch 'master' into irc-support

2019-09-18 13:03:16 +02:00
parent 997a0598cd b06918eb47
commit 3ab7362304
204 changed files with 17026 additions and 16467 deletions
@@ -4,10 +4,6 @@
 [submodule "lib/humanize"]
 	path = lib/humanize
 	url = https://github.com/pajlada/humanize.git
-[submodule "lib/websocketpp"]
-	path = lib/websocketpp
-	url = https://github.com/zaphoyd/websocketpp.git
-	branch = develop
 [submodule "lib/qBreakpad"]
 	path = lib/qBreakpad
 	url = https://github.com/jiakuan/qBreakpad.git
@@ -29,3 +25,6 @@
 [submodule "lib/qtkeychain"]
 	path = lib/qtkeychain
 	url = https://github.com/Chatterino/qtkeychain
+[submodule "lib/websocketpp"]
+	path = lib/websocketpp
+	url = https://github.com/ziocleto/websocketpp