Merge remote-tracking branch 'embed_metadata/embed_metadata_on_download'

Browse Source

# Conflicts:
#	cps/helper.py
#	cps/tasks/convert.py
#	cps/templates/config_edit.html

...

This commit is contained in:

Ozzie Isaacs

2024-02-10 10:49:09 +01:00

parent 57fb5001e2 e176d63ca6

commit 92c162b2fd

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