Merge remote-tracking branch 'upstream/main' into qt-refactor

Browse source

# Conflicts:
#	tagstudio/src/qt/ts_qt.py

...

This commit is contained in:

Andrew Arneson 2024-04-28 13:36:25 -06:00

parent 22e0ef8f4b fb300d0d07

commit 89b159cfa1

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

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

Diff content is not available