Merge remote-tracking branch 'origin/master' into next61

Browse Source

# Conflicts:
#	src/public/app/widgets/buttons/note_actions.js

...

This commit is contained in:

zadam 2023-07-22 17:49:29 +02:00

parent 3aad0ebc95 dc0a0dcf09

commit 98b0baefe2

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 Not Available