Valentin Mihai
41b07e88d1
Merge branch 'master' into VM/RED-2614
# Conflicts:
# apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts
# apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts
# apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts
# apps/red-ui/src/app/modules/admin/screens/general-config/general-config-form/general-config-form.component.ts
# apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.ts
# apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.ts
# apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
# libs/common-ui