Merge remote-tracking branch 'origin/master' into front-v2
# Conflicts: # src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
This commit is contained in:
4
pom.xml
4
pom.xml
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user