Skip to content

Conversation

@rrromchIk
Copy link
Contributor

… user settings

rrromchIk added 7 commits May 8, 2025 20:00
…ation

# Conflicts:
#	src/app/features/settings/notifications/notifications.component.ts
# Conflicts:
#	src/app/core/components/root/root.component.spec.ts
#	src/app/core/services/json-api/underscore-entites/user/user-us.entity.ts
#	src/app/core/services/mappers/users/users.mapper.ts
#	src/app/core/services/user/user.entity.ts
#	src/app/features/settings/notifications/notifications.component.html
#	src/app/features/settings/notifications/notifications.component.ts
#	src/app/features/settings/profile-settings/profile-settings.api.service.ts
@rrromchIk rrromchIk self-assigned this May 16, 2025
@rrromchIk rrromchIk marked this pull request as ready for review May 20, 2025 16:34
@rrromchIk rrromchIk requested a review from nsemets May 20, 2025 16:34
rrromchIk added 4 commits May 21, 2025 11:32
# Conflicts:
#	src/app/core/services/user/user.entity.ts
#	src/app/features/settings/notifications/notifications.component.html
#	src/app/features/settings/notifications/notifications.component.ts
@rrromchIk rrromchIk requested a review from nsemets May 21, 2025 09:22
@rrromchIk rrromchIk merged commit abdd882 into main May 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants