merge request id	720
Titel	Feature/ll 1324 change language file e mail
Beschreibung
Status	merged
Created at	2023-01-04T16:56:31.539Z
Updated at	2023-01-05T11:50:35.036Z
Source branch	feature/LL-1324-change-language-file-e-mail
Target branch	develop
Author	Markus Gerlach
Assignee	Sascha Immig

Discussion notes

added 38 commits 2838f419...3d7a0bc2 - 37 commits from branch develop bc6bcb8d - Merge branch 'develop' into feature/LL-1324-change-language-file-e-mail Compare with previous version	Markus Gerlach	2023-01-04T17:35:28.151Z
merged	Sascha Immig	2023-01-05T11:50:35.118Z
mentioned in commit 7d05ceba7302c6d6f920f0829c3f12633a8010bc	Sascha Immig	2023-01-05T11:50:35.318Z

Merge Commits

Title	Id	Author	Created at	Message
LL-1324-change-language-file-e-mail and translate all used emails PART I	123a9321af71ebba26b97e5c3efa463b732865b1	gerlachm	2022-12-20T07:49:55.000Z	LL-1324-change-language-file-e-mail and translate all used emails PART I
LL-1324-change-language-file-e-mail and translate all used emails PART II/II	147a4397bfa1756210fa49026392e7aaefed5fee	gerlachm	2023-01-04T16:22:13.000Z	LL-1324-change-language-file-e-mail and translate all used emails PART II/II Add missing 'users.username' as 'users.user_name' Change entries with " to ' and unnecessary " removed spelling correction, added translation
LL-1324-change-language-file-e-mail	2838f419742ae6a1cbea121988b438d5a17f3721	gerlachm	2023-01-04T16:42:11.000Z	LL-1324-change-language-file-e-mail added missing translation
Merge branch 'develop' into feature/LL-1324-change-language-file-e-mail	bc6bcb8d9bdb955456f67dd75a9cc4d78b1d0740	gerlachm	2023-01-04T17:35:20.000Z	Merge branch 'develop' into feature/LL-1324-change-language-file-e-mail # Conflicts: # app/Notifications/AccountCreated.php # resources/lang/de.json # resources/views/emails/subscriptions/created.blade.php # resources/views/emails/subscriptions/created_inform_client.blade.php