Merge remote-tracking branch 'origin/notevault-2' into notevault-2

Browse Source

# Conflicts:
#	.idea/deploymentTargetDropDown.xml

...

This commit is contained in:

Fawkes100 2025-01-18 08:04:45 +01:00

parent 193f8ee18c 6daedc49da

commit f99bbf3899

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