Timestamp:
09/14/26 21:15:01 (9 days ago)
Author:
Stefan-Saveski <stefansaveski19@…>
Branches:
master
Children:
10009b9
Parents:
c72ed3b (diff), 4b35197 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/Dev'

# Conflicts:
# iknow-api/Controllers/AuthController.cs
# iknow-api/DTOs/RefreshTokenDTO.cs
# iknow-api/DTOs/UserDTO.cs
# iknow-api/Data/AppDbContext.cs
# iknow-api/Migrations/AppDbContextModelSnapshot.cs
# iknow-api/Models/RefreshToken.cs
# iknow-api/Models/User.cs
# iknow-api/Program.cs
# iknow-api/Repository/Implementations/UserRepository.cs
# iknow-api/Repository/Interface/IUserRepository.cs
# iknow-api/Services/Implementations/AuthService.cs
# iknow-api/Services/Interfaces/IAuthService.cs
# iknow-api/appsettings.Development.json
# iknow-api/appsettings.json

File:
1 added

Note: See TracChangeset for help on using the changeset viewer.