Merge remote-tracking branch 'origin/master' into front-v2

# Conflicts:
#	src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
This commit is contained in:
2023-10-24 23:37:58 +03:00
27 changed files with 344 additions and 149 deletions

View File

@@ -48,6 +48,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>