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

pull/2695/merge

Ozzie Isaacs 3 months ago

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

Show Stats Download Patch File Download Diff File

Diff Content Not Available