Merge branch 'feature/90-accept_objects' of git.odit.services:lfk/backend into feature/90-accept_objects

Browse Source

# Conflicts:
#	src/models/actions/update/UpdatePermission.ts

...

This commit is contained in:

Nicolai Ort

2021-01-15 18:27:32 +01:00

parent 6b6f345618 2ac9d3e977

commit 67a02f06da

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