mirror of
https://github.com/thelounge/thelounge.git
synced 2026-06-11 07:04:37 -04:00
# Conflicts: # package.json # server/client.ts # server/models/network.ts # server/plugins/inputs/msg.ts # server/plugins/irc-events/message.ts # server/plugins/irc-events/standard-reply.ts # server/types/modules/irc-framework.d.ts # shared/types/msg.ts # test/.mocharc.yml