Merge branch 'feature/143-usergroup_permissions_endpoint' of git.odit.services:lfk/backend into feature/143-usergroup_permissions_endpoint

Browse Source

# Conflicts:
#	src/models/responses/ResponseUserGroup.ts

...

This commit is contained in:

Nicolai Ort 2021-02-09 18:26:33 +01:00

parent 416f2a1366 5e353db206

commit dd81f4c7e4

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