Daniel #5

Merged
bytegrip merged 9 commits from daniel into master 2023-09-21 10:00:51 +00:00

9 Commits

Author SHA1 Message Date
4c97a09d84 Changed folder structure 2023-09-21 12:58:08 +03:00
474cd3a6f6 Changed folder structure 2023-09-21 12:55:08 +03:00
Dmitrii Cravcenco
248982d128 Edit entities, add security package 2023-09-21 12:44:43 +03:00
fad1a8e284 Changed folder structure 2023-09-21 12:43:40 +03:00
dd86d669bf Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into daniel
# Conflicts:
#	src/main/java/com/faf223/expensetrackerfaf/controllers/MainController.java
#	src/main/resources/application.properties
2023-09-21 12:38:56 +03:00
984304a465 Changed folder structure 2023-09-21 12:37:28 +03:00
Dmitrii Cravcenco
1e9a547ffc Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into security_branch 2023-09-21 12:13:37 +03:00
Dmitrii Cravcenco
9ece427da2 Merge from master 2023-09-21 11:46:29 +03:00
Dmitrii Cravcenco
690e29a578 Add dependency 2023-09-21 11:41:53 +03:00