Merge branch 'feature/66-donation_api' of git.odit.services:lfk/backend into feature/66-donation_api

Browse Source

# Conflicts:
#	src/controllers/DonationController.ts

...

This commit is contained in:

Nicolai Ort

2021-01-12 19:01:14 +01:00

parent 2820f151e8 9517df5082

commit 110387dbd3

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