Merge remote-tracking branch 'origin/main'

Browse source

# Conflicts:
#	package.json
#	resources/files/config/config.json
#	src/DocxInserter.js

...

This commit is contained in:

Robert Nasarek 2022-09-16 07:35:13 +02:00

parent 9605a5b972 a3056fb72d

commit fc1b0a36a9

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