Merge remote-tracking branch 'origin/develop' into develop

Browse source

# Conflicts:
#	gui/src/components/chat.vue
#	gui/src/components/chat_conversations.vue
#	gui/src/components/chat_messages.vue

...

This commit is contained in:

DJ2LS 2024-02-07 10:23:30 +01:00

parent 0502506b90 6670e0a6d1

commit 634cb35048

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available