Merge branch 'feature/59-license_collection' of git.odit.services:lfk/backend into feature/59-license_collection

Browse Source

# Conflicts:
#	.drone.yml

...

This commit is contained in:

Nicolai Ort

2020-12-30 21:21:50 +01:00

parent 82d4b11de3 75473937cf

commit dfd82a6293

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