Merge branch 'dev' into feature/59-license_collection

Browse Source

# Conflicts:
#	.drone.yml

...

This commit is contained in:

niggl committed 2020-12-30 21:26:07 +01:00

2 parents 875781335c 5cfd2c9a52

commit ab7110d49f

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