Merge branch 'dev' into feature/59-license_collection

Browse Source

# Conflicts:
#	.drone.yml

...

This commit is contained in:

Nicolai Ort 2020-12-30 21:26:07 +01:00

parent 875781335c 5cfd2c9a52

commit ab7110d49f

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