mirror of
https://github.com/pixelfed/pixelfed.git
synced 2025-01-25 14:00:46 +00:00
resolve merge conflicts
This commit is contained in:
parent
370f09495a
commit
59e9c66b18
1 changed files with 0 additions and 1 deletions
|
@ -178,7 +178,6 @@ return [
|
|||
|
||||
'timeline' => [
|
||||
'peopleYouMayKnow' => 'Leute, die du vielleicht kennst',
|
||||
|
||||
'onboarding' => [
|
||||
'welcome' => 'Herzlich Willkommen',
|
||||
'thisIsYourHomeFeed' => 'Dies ist dein Heim-Feed, ein chronologischer Feed von Beiträgen aus den Konten, denen du folgst.',
|
||||
|
|
Loading…
Reference in a new issue