mirror of
https://github.com/thelounge/thelounge.git
synced 2026-07-31 07:05:52 -04:00
16d4e8354f
# Conflicts: # client/components/Channel.vue # client/components/ChatInput.vue # client/components/Message.vue # client/components/Settings/Account.vue # client/components/Settings/Appearance.vue # client/components/Settings/General.vue # client/components/Settings/Navigation.vue # client/components/Settings/Notifications.vue # client/components/StatusIcon.vue # client/css/settings.css # client/css/style.css # client/js/helpers/parse.ts # client/js/router.ts # client/js/settings.ts # client/js/socket-events/index.ts # client/js/socket-events/users.ts # server/client.ts # server/models/msg.ts # server/models/network.ts # server/plugins/inputs/msg.ts # server/plugins/irc-events/connection.ts # server/plugins/irc-events/join.ts # server/plugins/irc-events/message.ts # server/plugins/irc-events/nick.ts # server/plugins/irc-events/standard-reply.ts # server/plugins/irc-events/tagmsg.ts # server/server.ts # server/types/modules/irc-framework.d.ts # shared/types/msg.ts # shared/types/network.ts # shared/types/socket-events.d.ts # test/models/network.ts # test/plugins/irc-events/standardReplyTest.ts # test/plugins/tagmsg.ts # yarn.lock