Merge branch 'feature/69-translation-keys' of git.odit.services:lfk/frontend into feature/69-translation-keys

Browse Source

# Conflicts:
#	src/components/orgs/OrgOverview.svelte

...

This commit is contained in:

Nicolai Ort 2021-02-19 15:36:23 +01:00

parent 56b5008278 555778fca4

commit 89ea40d7f3

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