mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
e79d40e356
Conflicts: src/chatlog/chatlog.cpp src/chatlog/content/filetransferwidget.cpp src/core.cpp src/core/coreencryption.cpp src/toxdns.cpp src/widget/form/chatform.cpp src/widget/form/genericchatform.cpp src/widget/friendwidget.cpp src/widget/widget.cpp