Commit 3e0c371c authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'carsten-development-patch-36343' into 'development'

Update resources/lang/de/faq.php, resources/lang/en/team.php,...

See merge request !1371
parents 87243b85 48e94a3b