merge request id	592
Titel	+ added possibility to edit subscription price for superadmins
Beschreibung	+ fixed email footer for none client users + sorted permissions in user form + added null option in client select in user form
Status	merged
Created at	2022-03-22T08:25:48.862Z
Updated at	2022-03-25T14:29:54.396Z
Source branch	feature/LL-1147-make-price-editable-for-superuser
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 12 commits 17dec0ad...27617265 - 11 commits from branch develop 93c0d083 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2022-03-22T08:32:37.762Z
added 1 commit 1e6530d9 - updated markup and wording. added annotation to input instead of label. Compare with previous version	Sascha Immig	2022-03-25T14:19:18.762Z
merged	Sascha Immig	2022-03-25T14:29:54.468Z

Merge Commits

Title	Id	Author	Created at	Message
+ added possibility to edit subscription price for superadmins	17dec0add5f34dd2aee0f7babb5762ce727c59b9	TUV\gabrielg	2022-03-21T17:40:38.000Z	+ added possibility to edit subscription price for superadmins + fixed email footer for none client users + sorted permissions in user form + added null option in client select in user form
updated markup and wording. added annotation to input instead of label.	1e6530d9b8932940e5aa8d97932a6dbd13565ac2	TUV\immigs	2022-03-25T14:19:09.000Z	updated markup and wording. added annotation to input instead of label.
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	93c0d08340e9fc352a2119d698346ae07ba8a85c	TUV\gabrielg	2022-03-22T08:32:30.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1147-make-price-editable-for-superuser # Conflicts: # resources/views/vendor/notifications/email.blade.php