Files
social-media/src/Infrastructure/Migrations
Dominic Villemure fb5f925976 Merge remote-tracking branch 'origin/feature/update-current-user' into feature/update-current-user
# Conflicts:
#	src/Application/Common/Interfaces/IIdentityService.cs
#	src/Application/Common/Models/Result.cs
#	src/Application/Common/Models/UserModel.cs
#	src/Application/Users/Commands/UpdateCurrentUserCommand.cs
#	src/Application/Users/Models/SocialNetworksModel.cs
#	src/Application/Users/Queries/GetCurrentUser/GetCurrentUser.cs
#	src/Application/Users/Queries/GetCurrentUser/UserDto.cs
#	src/Infrastructure/Identity/ApplicationUser.cs
#	src/Infrastructure/Identity/IdentityService.cs
#	src/Infrastructure/Utils/GenerateJwtToken.cs
#	src/Web/Controllers/GoogleController.cs
#	src/Web/Endpoints/UpdateMyUser.cs
2024-07-04 20:43:04 -04:00
..